From 85940bcf152f8002329f80186a244c5a93ab748a Mon Sep 17 00:00:00 2001 From: Gabriele Pongelli Date: Wed, 1 Apr 2020 22:12:03 +0200 Subject: [PATCH 1/7] Added new env var DNS --- DockerEnv | 1 + Dockerfile | 1 + Dockerfile.armhf | 1 + 3 files changed, 3 insertions(+) diff --git a/DockerEnv b/DockerEnv index 7e9209b1a..cf55552ca 100644 --- a/DockerEnv +++ b/DockerEnv @@ -8,6 +8,7 @@ #ENABLE_UFW=false #UFW_ALLOW_GW_NET=false #UFW_EXTRA_PORTS= +#DNS= #UFW_DISABLE_IPTABLES_REJECT=false #GLOBAL_APPLY_PERMISSIONS=true #TRANSMISSION_ALT_SPEED_DOWN=50 diff --git a/Dockerfile b/Dockerfile index d2b2ad50f..928c4c502 100644 --- a/Dockerfile +++ b/Dockerfile @@ -46,6 +46,7 @@ ADD scripts /etc/scripts/ ENV OPENVPN_USERNAME=**None** \ OPENVPN_PASSWORD=**None** \ OPENVPN_PROVIDER=**None** \ + DNS=8.8.8.8 \ GLOBAL_APPLY_PERMISSIONS=true \ TRANSMISSION_ALT_SPEED_DOWN=50 \ TRANSMISSION_ALT_SPEED_ENABLED=false \ diff --git a/Dockerfile.armhf b/Dockerfile.armhf index feedd7196..dd09ac532 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -40,6 +40,7 @@ ADD scripts /etc/scripts/ ENV OPENVPN_USERNAME=**None** \ OPENVPN_PASSWORD=**None** \ OPENVPN_PROVIDER=**None** \ + DNS=8.8.8.8 \ GLOBAL_APPLY_PERMISSIONS=true \ TRANSMISSION_ALT_SPEED_DOWN=50 \ TRANSMISSION_ALT_SPEED_ENABLED=false \ From a460c31eb49f0429d44f4a912041fdecbacb9e6e Mon Sep 17 00:00:00 2001 From: Gabriele Pongelli Date: Wed, 1 Apr 2020 22:24:24 +0200 Subject: [PATCH 2/7] FreeVPN password is obtained into the update script, retrieved here and removed temporary file --- openvpn/start.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/openvpn/start.sh b/openvpn/start.sh index 09c51d7ff..38cd9515f 100755 --- a/openvpn/start.sh +++ b/openvpn/start.sh @@ -56,10 +56,12 @@ then elif [[ "${OPENVPN_PROVIDER^^}" = "FREEVPN" ]] then FREEVPN_DOMAIN=${OPENVPN_CONFIG%%-*} - export OPENVPN_PASSWORD=$(curl -s https://freevpn.${FREEVPN_DOMAIN:-"me"}/accounts/ | grep Password | sed s/"^.*Password\:.... "/""/g | sed s/"<.*"/""/g) # Update FreeVPN certs /etc/openvpn/updateFreeVPN.sh + # Get password obtained from updateFreeVPN.sh + export OPENVPN_PASSWORD=$(cat /etc/freevpn_password) + rm /etc/freevpn_password elif [[ "${OPENVPN_PROVIDER^^}" = "VPNBOOK" ]] then pwd_url=$(curl -s "https://www.vpnbook.com/freevpn" | grep -m2 "Password:" | tail -n1 | cut -d \" -f2) From 4ebf6bcfe9e7d91a80803fabaa3bfe87c6b46dfc Mon Sep 17 00:00:00 2001 From: Gabriele Pongelli Date: Wed, 1 Apr 2020 22:26:02 +0200 Subject: [PATCH 3/7] Use DNS env var to being able to reach freevpn server to download zip file and get server's password, saved into a temp file. --- openvpn/updateFreeVPN.sh | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/openvpn/updateFreeVPN.sh b/openvpn/updateFreeVPN.sh index 70aafd37c..b45e7df20 100755 --- a/openvpn/updateFreeVPN.sh +++ b/openvpn/updateFreeVPN.sh @@ -3,10 +3,22 @@ # Usage: # docker exec -it -w / **CONTAINER** bash -c "./etc/openvn/updateFreeVPN.sh" -DOMAIN=${OPENVPN_CONFIG%%-*} +# Use DNS env var to being able to connect to freevpn server removing +# the default content. +# DNS passed as command line argument or dockerfile doesn't work +echo "nameserver ${DNS}" > /etc/resolv.conf +# Debug purpose +# ping freevpn.me -c 4 + +DOMAIN=${OPENVPN_CONFIG%%-*} OPENVPN_IP=$(curl -s https://freevpn.${DOMAIN}/accounts/ | grep IP | sed s/"^.*IP\:.... "/""/g | sed s/"<.*"/""/g) + +# freevpn.me , main server, presents two servers with different address +# and related password to be used SERVER=${OPENVPN_IP%".freevpn.${DOMAIN}"} +PASSWORD=$(curl -s https://freevpn.${DOMAIN}/accounts/ | grep Password | sed s/"^.*Password\:.... "/""/g | sed s/"<.*"/""/g) +echo "${PASSWORD}" > /etc/freevpn_password DIR="/tmp/freevpn" TARGET="/etc/openvpn/freevpn" From a374bda848eec22eaa24a700aeda9950622c3435 Mon Sep 17 00:00:00 2001 From: Gabriele Pongelli Date: Sun, 5 Apr 2020 22:38:34 +0200 Subject: [PATCH 4/7] Using Google DNS by default --- openvpn/updateFreeVPN.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openvpn/updateFreeVPN.sh b/openvpn/updateFreeVPN.sh index b45e7df20..8c44c77b4 100755 --- a/openvpn/updateFreeVPN.sh +++ b/openvpn/updateFreeVPN.sh @@ -6,7 +6,7 @@ # Use DNS env var to being able to connect to freevpn server removing # the default content. # DNS passed as command line argument or dockerfile doesn't work -echo "nameserver ${DNS}" > /etc/resolv.conf +echo "nameserver 8.8.8.8" > /etc/resolv.conf # Debug purpose # ping freevpn.me -c 4 From 2254971b0712a6edfb759918f00884a4c0bf8e10 Mon Sep 17 00:00:00 2001 From: Gabriele Pongelli Date: Sun, 5 Apr 2020 22:39:04 +0200 Subject: [PATCH 5/7] Removed env var --- DockerEnv | 1 - 1 file changed, 1 deletion(-) diff --git a/DockerEnv b/DockerEnv index cf55552ca..7e9209b1a 100644 --- a/DockerEnv +++ b/DockerEnv @@ -8,7 +8,6 @@ #ENABLE_UFW=false #UFW_ALLOW_GW_NET=false #UFW_EXTRA_PORTS= -#DNS= #UFW_DISABLE_IPTABLES_REJECT=false #GLOBAL_APPLY_PERMISSIONS=true #TRANSMISSION_ALT_SPEED_DOWN=50 From 21e86b719cd7aadcd4bc814873df4034f8e9c0d7 Mon Sep 17 00:00:00 2001 From: Gabriele Pongelli Date: Sun, 5 Apr 2020 22:39:40 +0200 Subject: [PATCH 6/7] Removed env var --- Dockerfile | 1 - 1 file changed, 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 928c4c502..d2b2ad50f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -46,7 +46,6 @@ ADD scripts /etc/scripts/ ENV OPENVPN_USERNAME=**None** \ OPENVPN_PASSWORD=**None** \ OPENVPN_PROVIDER=**None** \ - DNS=8.8.8.8 \ GLOBAL_APPLY_PERMISSIONS=true \ TRANSMISSION_ALT_SPEED_DOWN=50 \ TRANSMISSION_ALT_SPEED_ENABLED=false \ From f202ed32a69256100346c65903c7fc9bb21bb284 Mon Sep 17 00:00:00 2001 From: Gabriele Pongelli Date: Sun, 5 Apr 2020 22:40:11 +0200 Subject: [PATCH 7/7] Removed env var --- Dockerfile.armhf | 1 - 1 file changed, 1 deletion(-) diff --git a/Dockerfile.armhf b/Dockerfile.armhf index dd09ac532..feedd7196 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -40,7 +40,6 @@ ADD scripts /etc/scripts/ ENV OPENVPN_USERNAME=**None** \ OPENVPN_PASSWORD=**None** \ OPENVPN_PROVIDER=**None** \ - DNS=8.8.8.8 \ GLOBAL_APPLY_PERMISSIONS=true \ TRANSMISSION_ALT_SPEED_DOWN=50 \ TRANSMISSION_ALT_SPEED_ENABLED=false \