simplify openvpn install and setup process

Author: aptalca

Dockerfile

@@ -17,41 +17,23 @@ RUN \
 	iptables \
 	net-tools \
 	rsync && \
- echo "**** install openvpn-as ****" && \
+ 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 /

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

@@ -9,10 +9,14 @@ if [ ! -c /dev/net/tun ]; then
 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/
+if [ -f /openvpn/openvpn.deb ]; then
+	echo "installing openvpn"
+	rm -rf /usr/local/openvpn_as
+	ln -s /config /usr/local/openvpn_as
+	dpkg -i /openvpn/openvpn.deb
+	rm /openvpn/openvpn.deb
+	apt-get clean
+	rm -rf /tmp
 fi
 
 # clear old sock files

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" && $(cat /config/etc/as.conf | grep "vpn.server.user=openvpn_as")) ]]; then
 # shellcheck disable=SC2059
-printf  "${CONFINPUT}" | /config/bin/ovpn-init
+printf  "${CONFINPUT}" | /usr/local/openvpn_as/bin/ovpn-init
 fi
 
 chown -R abc:abc \