Merge pull request #86 from thelamer/xenial

Xenial adding new deb package needed for 2.7.5 and up

Author: aptalca

Dockerfile

@@ -29,6 +29,9 @@ RUN \
  curl -o \
  /openvpn/openvpn.deb -L \
 	"https://swupdate.openvpn.org/as/openvpn-as-${OPENVPNAS_VERSION}-Ubuntu16.amd_64.deb" && \
+ curl -o \
+ /openvpn/openvpn-clients.deb -L \
+	"https://openvpn.net/downloads/openvpn-as-bundled-clients-latest.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 ****" && \

README.md

@@ -205,6 +205,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **27.08.19:** - Add new clients package to install and upgrade process.
 * **25.07.19:** - Create a xenial branch and rebase master 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: "27.08.19:", desc: "Add new clients package to install and upgrade process." }
   - { date: "25.07.19:", desc: "Create a xenial branch and rebase master 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

@@ -15,6 +15,7 @@ if [ -f /openvpn/openvpn.deb ]; then
 	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-clients.deb
 		dpkg -i /openvpn/openvpn.deb
 		rm /openvpn/openvpn.deb
 		sed -i \
@@ -36,6 +37,7 @@ if [ -f /openvpn/openvpn.deb ]; then
 		cp /config/etc/as.conf /config/backup/as.conf
 		cd /config || exit
 		rm -rf !("backup"|"log")
+		dpkg -i /openvpn/openvpn-clients.deb
 		dpkg -i /openvpn/openvpn.deb
 		rm /openvpn/openvpn.deb
 		sed -i \