bea/docker-deluge-openvpn
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #755 from Troubadoure/master

Browse Source 
Fixed issue with default.ovpn stopping container from running
This commit is contained in:
Kristian Haugene
2019-03-26 13:25:17 +01:00
committed by GitHub
parent f4c9cf50f7 aaab2f0155
commit b27fada22f
2 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Dockerfile
View File

@@ -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 \

17
openvpn/nordvpn/updateConfigs.sh
View File

@@ -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%/*}"
ln -sf $random_config default.ovpn
cd "${0%/*}"