Merge pull request #84 from linuxserver/init

Prevent auto start after install and init, let s6 start it

Author: j0nnymoe

README.md

@@ -205,6 +205,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **22.08.19:** - Prevent auto-start of openvpn after first time install, before configuration is completed.
 * **25.07.19:** - Create a xenial branch/tag and rebase master/latest to bionic.
 * **07.04.19:** - Fix first time config.
 * **03.04.19:** - Big rewrite of the install and update logic of openvpn-as to fix breaking changes (should fix updating from 2.6.1 to 2.7.3), added mysql-client for cluster support.

readme-vars.yml

@@ -63,6 +63,7 @@ app_setup_block: |
 
 # changelog
 changelogs:
+  - { date: "22.08.19:", desc: "Prevent auto-start of openvpn after first time install, before configuration is completed." }
   - { date: "25.07.19:", desc: "Create a xenial branch/tag and rebase master/latest to bionic." }
   - { date: "07.04.19:", desc: "Fix first time config." }
   - { date: "03.04.19:", desc: "Big rewrite of the install and update logic of openvpn-as to fix breaking changes (should fix updating from 2.6.1 to 2.7.3), added mysql-client for cluster support." }

root/etc/cont-init.d/30-config

@@ -16,6 +16,8 @@ if [ -f /openvpn/openvpn.deb ]; then
 	if [ ! -f /config/etc/as.conf ]; then
 		echo "installing openvpn-as for the first time"
 		dpkg -i /openvpn/openvpn.deb
+		echo "Stopping openvpn-as now; will start again later after configuring"
+		kill `cat /var/run/openvpnas.pid`
 		rm /openvpn/openvpn.deb
 		sed -i \
 			-e 's#=openvpn_as#=abc#g' \
@@ -37,6 +39,8 @@ if [ -f /openvpn/openvpn.deb ]; then
 		cd /config || exit
 		rm -rf !("backup"|"log")
 		dpkg -i /openvpn/openvpn.deb
+		echo "Stopping openvpn-as now; will start again later after configuring"
+		kill `cat /var/run/openvpnas.pid`
 		rm /openvpn/openvpn.deb
 		sed -i \
 			-e 's#=openvpn_as#=abc#g' \

root/etc/cont-init.d/40-openvpn-init

@@ -12,6 +12,8 @@ fi
 if [[ $(find /config/etc/db -type f | wc -l) -eq 0 || ! -f "/config/etc/as.conf" || (-f "/config/etc/as.conf" && $(grep "vpn.server.user=openvpn_as" /config/etc/as.conf)) ]]; then
 # shellcheck disable=SC2059
 printf  "${CONFINPUT}" | /usr/local/openvpn_as/bin/ovpn-init
+echo "Stopping openvpn-as now; will start again later after configuring"
+kill `cat /var/run/openvpnas.pid`
 fi
 
 chown -R abc:abc \