Merge pull request #111 from linuxserver/xenial-repo

install openvpn-as from repo

Author: j0nnymoe

Dockerfile

@@ -15,6 +15,7 @@ RUN \
  apt-get update && \
  apt-get install -y \
 	bridge-utils \
+	gnupg \
 	iproute2 \
 	iptables \
 	liblzo2-2 \
@@ -28,19 +29,14 @@ RUN \
 	rsync \
 	sqlite3 \
 	ucarp && \
- echo "**** download openvpn-as ****" && \
+ echo "**** add openvpn-as repo ****" && \
+ curl -s https://as-repository.openvpn.net/as-repo-public.gpg | apt-key add - && \
+ echo "deb http://as-repository.openvpn.net/as/debian xenial main">/etc/apt/sources.list.d/openvpn-as-repo.list && \
  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}'); \
+	OPENVPNAS_VERSION=$(curl -sX GET http://as-repository.openvpn.net/as/debian/dists/xenial/main/binary-amd64/Packages.gz | gunzip -c \
+	|grep -A 7 -m 1 "Package: openvpn-as" | awk -F ": " '/Version/{print $2;exit}');\
  fi && \
- mkdir /openvpn && \
- curl -o \
- /openvpn/openvpn.deb -L \
-	"https://swupdate.openvpn.org/as/openvpn-as-${OPENVPNAS_VERSION}-Ubuntu16.amd64.deb" && \
- curl -o \
- /openvpn/openvpn-clients.deb -L \
-	"https://openvpn.net/downloads/openvpn-as-bundled-clients-latest.deb" && \
+ echo "$OPENVPNAS_VERSION" > /version.txt && \
  echo "**** ensure home folder for abc user set to /config ****" && \
  usermod -d /config abc && \
  echo "**** create admin user and set default password for it ****" && \

Jenkinsfile

@@ -103,7 +103,7 @@ pipeline {
       steps{
         script{
           env.EXT_RELEASE = sh(
-            script: ''' curl -w '%{url_effective}' -ILsS https://openvpn.net/downloads/openvpn-as-latest-ubuntu16.amd_64.deb -o /dev/null | awk -F '(openvpn-as-|-Ubuntu16)' '{print $2}' ''',
+            script: ''' curl -sX GET http://as-repository.openvpn.net/as/debian/dists/xenial/main/binary-amd64/Packages.gz | gunzip -c |grep -A 7 -m 1 'Package: openvpn-as' | awk -F ': ' '/Version/{print $2;exit}' ''',
             returnStdout: true).trim()
             env.RELEASE_LINK = 'custom_command'
         }

README.md

@@ -231,6 +231,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **26.03.20:** - Switch to using the openvpn-as repo for packages.
 * **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.

jenkins-vars.yml

@@ -3,7 +3,7 @@
 # jenkins variables
 project_name: docker-openvpn-as
 external_type: na
-custom_version_command: "curl -w '%{url_effective}' -ILsS https://openvpn.net/downloads/openvpn-as-latest-ubuntu16.amd_64.deb -o /dev/null | awk -F '(openvpn-as-|-Ubuntu16)' '{print $2}'"
+custom_version_command: "curl -sX GET http://as-repository.openvpn.net/as/debian/dists/xenial/main/binary-amd64/Packages.gz | gunzip -c |grep -A 7 -m 1 'Package: openvpn-as' | awk -F ': ' '/Version/{print $2;exit}'"
 release_type: prerelease
 release_tag: xenial
 ls_branch: xenial

readme-vars.yml

@@ -63,6 +63,7 @@ app_setup_block: |
 
 # changelog
 changelogs:
+  - { date: "26.03.20:", desc: "Switch to using the openvpn-as repo for packages." }
   - { 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." }

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

@@ -1,6 +1,6 @@
 #!/usr/bin/with-contenv bash
 
-# make folders
+# make folders
 mkdir -p /openvpn{/pid,/sock,/tmp} /dev/net /config/log /config/etc/tmp
 
 # create tun device
@@ -9,15 +9,19 @@ if [ ! -c /dev/net/tun ]; then
 fi
 
 shopt -s extglob
-# install or update openvpn-as
-if [ -f /openvpn/openvpn.deb ]; then
+# install or update openvpn-as
+if [ -f /version.txt ]; then
+	OPENVPNAS_VERSION=$(cat /version.txt)
 	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-clients.deb
-		dpkg -i /openvpn/openvpn.deb
-		rm /openvpn/openvpn.deb
+		apt-get update && \
+		apt-get install -y \
+			openvpn-as=$OPENVPNAS_VERSION
+		echo "Stopping openvpn-as now; will start again later after configuring"
+		kill `cat /var/run/openvpnas.pid`
+		rm /version.txt
 		sed -i \
 			-e 's#=openvpn_as#=abc#g' \
 			-e 's#~/tmp#/openvpn/tmp#g' \
@@ -37,9 +41,12 @@ 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
+		apt-get update && \
+		apt-get install -y \
+			openvpn-as=$OPENVPNAS_VERSION
+		echo "Stopping openvpn-as now; will start again later after configuring"
+		kill `cat /var/run/openvpnas.pid`
+		rm /version.txt
 		sed -i \
 			-e 's#=openvpn_as#=abc#g' \
 			-e 's#~/tmp#/openvpn/tmp#g' \
@@ -61,15 +68,15 @@ if [ -f /openvpn/openvpn.deb ]; then
 fi
 shopt -u extglob
 
-# clear old sock files
+# clear old sock files
 for file in /openvpn/sock/*
 	do
 		if [ -e "$file" ]; then
 		rm -rf "$file"
 		fi
 	done
 
-# clear old pid files
+# clear old pid files
 for file in /openvpn/pid/*
 	do
 		if [ -e "$file" ]; then
@@ -78,6 +85,6 @@ for file in /openvpn/pid/*
 	done
 
 
-# permissions
+# permissions
 chown abc:abc /config/log /config/etc/tmp
 chmod -R 755 /openvpn