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] <support@github.com>
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 <jonathaf@netapp.com>

* Docs: add capabilities for Podman to tips&tricks (#2546)

Co-authored-by: Tomas Vik <tvik@gitlab.com>

* 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] <support@github.com>
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 <jonathaf@netapp.com>
Co-authored-by: Patrick Kishino <patrick.a.kishino@gmail.com>
Co-authored-by: Tomas Vik <tvik@gitlab.com>
This commit is contained in:
Derek Gordon 2023-04-14 00:10:15 -04:00 committed by GitHub
parent 2322fd117d
commit 0e23559b69
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 21 additions and 7 deletions

View File

@ -1 +1,2 @@
.git
.github

View File

@ -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
#fi