Merge pull request #75 from linuxserver/rewrite

Rewrite of install/update logic, added mysql client for cluster support

Author: Josh Stark

Dockerfile

@@ -15,43 +15,27 @@ RUN \
  apt-get update && \
  apt-get install -y \
 	iptables \
+	libmysqlclient-dev \
 	net-tools \
-	rsync && \
- echo "**** install openvpn-as ****" && \
+	rsync \
+	sqlite3 && \
+ echo "**** download openvpn-as ****" && \
  if [ -z ${OPENVPNAS_VERSION+x} ]; then \
 	OPENVPNAS_VERSION=$(curl -w "%{url_effective}" -ILsS -o /dev/null \
 	https://openvpn.net/downloads/openvpn-as-latest-ubuntu16.amd_64.deb \
 	| awk -F '(openvpn-as-|-Ubuntu16)' '{print $2}'); \
  fi && \
+ mkdir /openvpn && \
  curl -o \
- /tmp/openvpn.deb -L \
+ /openvpn/openvpn.deb -L \
 	"https://swupdate.openvpn.org/as/openvpn-as-${OPENVPNAS_VERSION}-Ubuntu16.amd_64.deb" && \
- dpkg -i /tmp/openvpn.deb && \
  echo "**** ensure home folder for abc user set to /config ****" && \
  usermod -d /config abc && \
  echo "**** create admin user and set default password for it ****" && \
  useradd -s /sbin/nologin admin && \
  echo "admin:password" | chpasswd && \
- echo "**** configure openvpn-as ****" && \
- find /usr/local/openvpn_as/scripts -type f -print0 | \
-	xargs -0 sed -i 's#/usr/local/openvpn_as#/config#g' && \
- find /usr/local/openvpn_as/bin -type f -print0 | \
-	xargs -0 sed -i 's#/usr/local/openvpn_as#/config#g' && \
- sed -i \
-		-e 's#=openvpn_as#=abc#g' \
-		-e 's#~/tmp#/openvpn/tmp#g' \
-		-e 's#~/sock#/openvpn/sock#g' \
-	/usr/local/openvpn_as/etc/as_templ.conf && \
- echo "**** cleanup ****" && \
- apt-get clean && \
  rm -rf \
-	/tmp/* \
-	/usr/local/openvpn_as/etc/db/* \
-	/usr/local/openvpn_as/etc/sock \
-	/usr/local/openvpn_as/etc/tmp \
-	/usr/local/openvpn_as/tmp \
-	/var/lib/apt/lists/* \
-	/var/tmp/*
+	/tmp/*
 
 # add local files
 COPY /root /

README.md

@@ -174,6 +174,7 @@ Below are the instructions for updating containers:
 
 ## Versions
 
+* **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.
 * **14.03.19:** - Update deb package URL.
 * **21.02.19:** - Rebase to xenial due to incompatibility issues on some older host OSes.
 * **12.02.19:** - Rename github repo to match the docker hub repo and container name.

readme-vars.yml

@@ -60,6 +60,7 @@ app_setup_block: |
 
 # changelog
 changelogs:
+  - { 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." }
   - { date: "14.03.19:", desc: "Update deb package URL." }
   - { date: "21.02.19:", desc: "Rebase to xenial due to incompatibility issues on some older host OSes." }
   - { date: "12.02.19:", desc: "Rename github repo to match the docker hub repo and container name." }

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

@@ -8,12 +8,51 @@ if [ ! -c /dev/net/tun ]; then
   mknod /dev/net/tun c 10 200
 fi
 
-# copy config or update
-if [ ! -f /config/bin/ovpn-init ]; then
-	cp -pr /usr/local/openvpn_as/* /config/
-else
-	rsync -rlptD --exclude="/etc/as.conf" --exclude="/etc/config.json" --exclude="/tmp" /usr/local/openvpn_as/ /config/
+shopt -s extglob
+# install or update openvpn-as
+if [ -f /openvpn/openvpn.deb ]; then
+	rm -rf /usr/local/openvpn_as
+	ln -s /config /usr/local/openvpn_as
+	if [ ! -f /config/etc/as.conf ]; then
+		echo "installing openvpn-as for the first time"
+		dpkg -i /openvpn/openvpn.deb
+		rm /openvpn/openvpn.deb
+	else
+		echo "existing data found, reinstalling openvpn-as"
+		mkdir -p /config/backup
+		cd /config/etc/db || exit
+		DBFILESBAK="*.db"
+		for f in $DBFILESBAK
+		do
+			echo "backing up $f"
+			sqlite3 "$f" .dump > /config/backup/"$f"
+		done
+		echo "backing up as.conf"
+		cp /config/etc/as.conf /config/backup/as.conf
+		cd /config || exit
+		rm -rf !("backup"|"log")
+		dpkg -i /openvpn/openvpn.deb
+		rm /openvpn/openvpn.deb
+		sed -i \
+			-e 's#=openvpn_as#=abc#g' \
+			-e 's#~/tmp#/openvpn/tmp#g' \
+			-e 's#~/sock#/openvpn/sock#g' \
+			/usr/local/openvpn_as/etc/as_templ.conf
+		cd /config/backup || exit
+		DBFILERES="*.db"
+		for f in $DBFILERES
+		do
+			echo "restoring $f"
+			rm -f /config/etc/db/"$f"
+			sqlite3 </config/backup/"$f" /config/etc/db/"$f"
+		done
+		rm -f /config/etc/as.conf
+		echo "restoring as.conf"
+		cp /config/backup/as.conf /config/etc/as.conf
+		rm -rf /config/backup
+	fi
 fi
+shopt -u extglob
 
 # clear old sock files
 for file in /openvpn/sock/*

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

@@ -9,9 +9,9 @@ else
 CONFINPUT=$NOASCONFIG$ASCONFIG
 fi
 
-if [[ $(find /config/etc/db -type f | wc -l) -eq 0 || ! -f "/config/etc/as.conf" ]]; then
+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}" | /config/bin/ovpn-init
+printf  "${CONFINPUT}" | /usr/local/openvpn_as/bin/ovpn-init
 fi
 
 chown -R abc:abc \

root/etc/cont-init.d/50-interface

@@ -6,8 +6,8 @@ else
 SET_INTERFACE=$INTERFACE
 fi
 
-/config/scripts/confdba -mk "admin_ui.https.ip_address" -v "$SET_INTERFACE"
-/config/scripts/confdba -mk "cs.https.ip_address" -v "$SET_INTERFACE"
-/config/scripts/confdba -mk "vpn.daemon.0.listen.ip_address" -v "$SET_INTERFACE"
-/config/scripts/confdba -mk "vpn.daemon.0.server.ip_address" -v "$SET_INTERFACE"
+/usr/local/openvpn_as/scripts/confdba -mk "admin_ui.https.ip_address" -v "$SET_INTERFACE"
+/usr/local/openvpn_as/scripts/confdba -mk "cs.https.ip_address" -v "$SET_INTERFACE"
+/usr/local/openvpn_as/scripts/confdba -mk "vpn.daemon.0.listen.ip_address" -v "$SET_INTERFACE"
+/usr/local/openvpn_as/scripts/confdba -mk "vpn.daemon.0.server.ip_address" -v "$SET_INTERFACE"
 

root/etc/services.d/openvpn/run

@@ -1,3 +1,3 @@
 #!/usr/bin/with-contenv bash
 
-/config/scripts/openvpnas --nodaemon --umask=0077 --pidfile=/openvpn/pid/openvpn.pid --logfile=/config/log/openvpn.log
+/usr/local/openvpn_as/scripts/openvpnas --nodaemon --umask=0077 --pidfile=/openvpn/pid/openvpn.pid --logfile=/config/log/openvpn.log