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