From 0e23559b69f3de9dcca6c83a2266793921912a09 Mon Sep 17 00:00:00 2001 From: Derek Gordon Date: Fri, 14 Apr 2023 00:10:15 -0400 Subject: [PATCH] OVPN script fix for for 4.x branch (#2566) * Bump docker/build-push-action from 3 to 4 (#2534) Bumps [docker/build-push-action](https://github.com/docker/build-push-action) from 3 to 4. - [Release notes](https://github.com/docker/build-push-action/releases) - [Commits](https://github.com/docker/build-push-action/compare/v3...v4) --- updated-dependencies: - dependency-name: docker/build-push-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Socks5 example doc (#2541) * fixing some heading sizes * adding socks5-proxy example --------- Co-authored-by: Jonathan Fair * Docs: add capabilities for Podman to tips&tricks (#2546) Co-authored-by: Tomas Vik * git instead of unzip git instead of unzip * Using GIT GIT is used now instead of UNZIP due to issues suddenly experienced. --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: JtMotoX <7191259+JtMotoX@users.noreply.github.com> Co-authored-by: Jonathan Fair Co-authored-by: Patrick Kishino Co-authored-by: Tomas Vik --- .dockerignore | 1 + openvpn/ovpn/configure-openvpn.sh | 27 ++++++++++++++++++++------- 2 files changed, 21 insertions(+), 7 deletions(-) diff --git a/.dockerignore b/.dockerignore index 6b8710a71..f4b11987f 100644 --- a/.dockerignore +++ b/.dockerignore @@ -1 +1,2 @@ .git +.github diff --git a/openvpn/ovpn/configure-openvpn.sh b/openvpn/ovpn/configure-openvpn.sh index 92a3c4f6d..c443dbf26 100755 --- a/openvpn/ovpn/configure-openvpn.sh +++ b/openvpn/ovpn/configure-openvpn.sh @@ -41,11 +41,25 @@ echo "Downloading OpenVPN config bundle into temporary file $tmp_file" #svn not baked into docker, leave for another day #svn export https://github.com/haugene/vpn-configs-contrib/tree/main/openvpn/" -wget -c https://github.com/haugene/vpn-configs-contrib/archive/refs/heads/main.zip -P /tmp/ -echo "Extract OpenVPN config bundle into $VPN_PROVIDER_HOME" -unzip /tmp/main.zip "vpn-configs-contrib-main/openvpn/ovpn/*" -d /tmp/ -mv /tmp/vpn-configs-contrib-main/openvpn/ovpn/* /etc/openvpn/ovpn -rm /tmp/vpn-configs-contrib-main/openvpn/ovpn/ -R +#wget -c https://github.com/haugene/vpn-configs-contrib/archive/refs/heads/main.zip -P /tmp/ +#echo "Extract OpenVPN config bundle into $VPN_PROVIDER_HOME" +#unzip /tmp/main.zip "vpn-configs-contrib-main/openvpn/ovpn/*" -d /tmp/ +#mv /tmp/vpn-configs-contrib-main/openvpn/ovpn/* /etc/openvpn/ovpn +#rm /tmp/vpn-configs-contrib-main/openvpn/ovpn/ -R +#rm /tmp/main.zip + + +echo "creating temp folder" +mkdir /tmp/ovpnxtract/ +echo "entering temp folder" +cd /tmp/ovpnxtract/ +git clone https://github.com/haugene/vpn-configs-contrib.git +echo "moving content" +mv /tmp/ovpnxtract/vpn-configs-contrib/openvpn/ovpn/* /etc/openvpn/ovpn +echo "deleting temp folder" +rm -rf /tmp/ovpnxtract/ + +#rm /tmp/vpn-configs-contrib-main/ #test repo #wget -c https://github.com/derekcentrico/vpn-configs-contrib-ovpnwork/archive/refs/heads/main.zip -P /tmp/ @@ -53,7 +67,6 @@ rm /tmp/vpn-configs-contrib-main/openvpn/ovpn/ -R #mv /tmp/vpn-configs-contrib-ovpnwork-main/openvpn/ovpn/* /etc/openvpn/ovpn #rm /tmp/vpn-configs-contrib-ovpnwork-main/openvpn/ovpn/ -R -rm /tmp/main.zip #pattern=$OVPN_CONNECTION.$OVPN_COUNTRY.$OVPN_CITY.$OVPN_PROTOCOL @@ -66,4 +79,4 @@ OPENVPN_CONFIG=$OVPN_CONNECTION.$OVPN_COUNTRY.$OVPN_CITY.$OVPN_PROTOCOL #else # echo "There is no available config matching provided options!" # exit 3 -#fi \ No newline at end of file +#fi