Commit 60c69c8

committed

Merge branch 'develop'

2 parents 7ffd91c + 9eafcd2 commit 60c69c8Copy full SHA for 60c69c8

File tree

-2

lines changed

-2

lines changed

Lines changed: 4 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,9 @@`
`1`	`1`	`# Changelog`
`2`	`2`
	`3`	`+### 3.0.6 - Persistent interface`
	`4`	`+`
	`5`	`+- Added persistent interface variable`
	`6`	`+`
`3`	`7`	`### 3.0.5 - New base image`
`4`	`8`
`5`	`9`	`- Updated to new base image`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -80,6 +80,7 @@ services:`
`80`	`80`	\|`-e FAIL_MODE=hard`\|Restart whole container on error\|
`81`	`81`	\|`-e NO_CRL_UPDATE=true`\|Disable auto CRL update (used when CA is password protected)\|
`82`	`82`	\|`-e NO_CRON=true`\|Disable Cron for CRL update ...\|
	`83`	+\|`-e PERSIST_INTERFACE=true`\|Persist tunnel interface\|
`83`	`84`	\|`-e PUID=1000`\|for UserID - see below for explanation\|
`84`	`85`	\|`-e PGID=1000`\|for GroupID - see below for explanation\|
`85`	`86`	\|`-e SKIP_APP=true`\|Skip app startup\|

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ if [ -z "$device" ]; then`
`17`	`17`	`fi`
`18`	`18`
`19`	`19`	`# Delete tunnel interface (if not persistant)`
`20`		`-if [ -n "$(cat /proc/net/dev \| grep $device)" ] && [ ! -f "/config/persistent-interface" ]; then`
	`20`	`+if [ -n "$(cat /proc/net/dev \| grep $device)" ] && [ ! -f "/config/persistent-interface" ]&& [ -z"$PERSIST_INTERFACE" ]; then`
`21`	`21`	`echo "Removing $device interface"`
`22`	`22`	`openvpn --rmtun --dev $device`
`23`	`23`	`fi`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ if [ -z "$device" ]; then`
`34`	`34`	`fi`
`35`	`35`
`36`	`36`	`# Delete tunnel interface (if not persistant), so no permission errors occur`
`37`		`-if [ -n "$(cat /proc/net/dev \| grep $device)" ] && [ ! -f "/config/persistent-interface" ]; then`
	`37`	`+if [ -n "$(cat /proc/net/dev \| grep $device)" ] && [ ! -f "/config/persistent-interface" ]&& [ -z"$PERSIST_INTERFACE" ]; then`
`38`	`38`	`echo "Removing $device interface"`
`39`	`39`	`openvpn --rmtun --dev $device`
`40`	`40`	`fi`

Comments

(0)