From aaab2f0155b84f954912f6f3a0cce41b2a865fc7 Mon Sep 17 00:00:00 2001
From: Tom Humphrey <tom.humphrey@mac.com>
Date: Tue, 26 Mar 2019 12:18:29 +0000
Subject: [PATCH] Fixed issue with default.ovpn stopping container from running

container was being stopped due to sed not liking default.ovpn symlink. Updated so that sed skipped this symlink. container was then also being stopped due to updateConfigs.sh script erroring if default.ovpn existed when trying to create symlink. Added option 'f' so that the symlink would be recreated even if existed
---
 Dockerfile                       |  2 +-
 openvpn/nordvpn/updateConfigs.sh | 17 +++++++++--------
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 80943a655..c13d3b578 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -49,7 +49,7 @@ ENV OPENVPN_USERNAME=**None** \
     OPENVPN_PASSWORD=**None** \
     OPENVPN_PROVIDER=**None** \
     NORDVPN_COUNTRY= \
-    NORDVPN_PROTOCOL=TCP \
+    NORDVPN_PROTOCOL=UDP \
     NORDVPN_CATEGORY=P2P \
     GLOBAL_APPLY_PERMISSIONS=true \
     TRANSMISSION_ALT_SPEED_DOWN=50 \
diff --git a/openvpn/nordvpn/updateConfigs.sh b/openvpn/nordvpn/updateConfigs.sh
index c3f2b8215..56f92fc8f 100755
--- a/openvpn/nordvpn/updateConfigs.sh
+++ b/openvpn/nordvpn/updateConfigs.sh
@@ -41,24 +41,25 @@ log "Downloading latest configs"
 curl -skL https://downloads.nordcdn.com/configs/archives/servers/ovpn.zip -o openvpn.zip \
   && unzip -j openvpn.zip $1 >/dev/null 2>&1 && rm openvpn.zip
 
-
 # Ensure linux line endings
 log "Checking line endings"
 # dos2unix * $1 >/dev/null 2>&1
 # find . -name '*.ovpn' -type f -print 0 | xargs -0 sed -i 's/^M$//'
-find ${VPN_PROVIDER_CONFIGS} -name '*.ovpn' -type f -exec sed -i 's/^M$//' {} \;
+
+find ${VPN_PROVIDER_CONFIGS} -name '*nordvpn*.ovpn' -type f -exec sed -i 's/^M$//' {} \;
 
 # Update configs with correct options
 log "Updating configs for docker-transmission-openvpn"
-sed -i 's=auth-user-pass=auth-user-pass /config/openvpn-credentials.txt=g' *.ovpn
+sed -i 's=auth-user-pass=auth-user-pass /config/openvpn-credentials.txt=g' *nordvpn*.ovpn
 sed -i 's/ping 15/inactive 3600\
-ping 10/g' *.ovpn
-sed -i 's/ping-restart 0/ping-exit 60/g' *.ovpn
-sed -i 's/ping-timer-rem//g' *.ovpn
+ping 10/g' *nordvpn*.ovpn
+sed -i 's/ping-restart 0/ping-exit 60/g' *nordvpn*.ovpn
+sed -i 's/ping-timer-rem//g' *nordvpn*.ovpn
 
 # Pick a random file config for default.ovpn
 random_config=$(ls uk*udp* | sort -R | head -n1)
 log "Setting default.ovpn to $random_config"
-ln -s $random_config default.ovpn
 
-cd "${0%/*}"
\ No newline at end of file
+ln -sf $random_config default.ovpn
+
+cd "${0%/*}"