update readme and jenkinsfile

Author: aptalca

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-ubuntu18.amd_64.deb -o /dev/null | awk -F '(openvpn-as-|-Ubuntu18)' '{print $2}' ''',
+            script: ''' curl -sX GET http://as-repository.openvpn.net/as/debian/dists/bionic/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

@@ -234,6 +234,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.
 * **29.08.19:** - Update Application Setup instructions in readme to fix 2.7.5 login issue for existing users.
 * **27.08.19:** - Add new clients package to install and upgrade process.
 * **22.08.19:** - Prevent auto-start of openvpn after first time install, before configuration is completed.

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-ubuntu18.amd_64.deb -o /dev/null | awk -F '(openvpn-as-|-Ubuntu18)' '{print $2}'"
+custom_version_command: "curl -sX GET http://as-repository.openvpn.net/as/debian/dists/bionic/main/binary-amd64/Packages.gz | gunzip -c |grep -A 7 -m 1 'Package: openvpn-as' | awk -F ': ' '/Version/{print $2;exit}'"
 release_type: stable
 release_tag: latest
 ls_branch: master

readme-vars.yml

@@ -66,6 +66,7 @@ app_setup_block: |
 
 # changelog
 changelogs:
+  - { date: "26.03.20:", desc: "Switch to using the openvpn-as repo for packages." }
   - { date: "29.08.19:", desc: "Update Application Setup instructions in readme to fix 2.7.5 login issue for existing users." }
   - { date: "27.08.19:", desc: "Add new clients package to install and upgrade process." }
   - { date: "22.08.19:", desc: "Prevent auto-start of openvpn after first time install, before configuration is completed." }