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

Merge pull request #760 from Troubadoure/master

Browse Source 
Fix for automatic setting of NORDVPN_PROTOCOL
This commit is contained in:
Kristian Haugene
2019-03-27 15:07:03 +01:00
committed by GitHub
parent 615624af0b 43da3ea5f6
commit 0e0f6786a4
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
openvpn/nordvpn/updateConfigs.sh
View File

@@ -85,9 +85,9 @@ select_hostname() { #TODO return multiples
download_hostname() { download_hostname() {
# "https://downloads.nordcdn.com/configs/files/ovpn_udp/servers/us3373.nordvpn.com.udp.ovpn" # "https://downloads.nordcdn.com/configs/files/ovpn_udp/servers/us3373.nordvpn.com.udp.ovpn"
local nordvpn_cdn="https://downloads.nordcdn.com/configs/files/" local nordvpn_cdn="https://downloads.nordcdn.com/configs/files/"
if [[ ${NORDVPN_PROTOCOL,,} =~ udp ]]; then if [[ ${NORDVPN_PROTOCOL,,} == udp ]]; then
nordvpn_cdn="${nordvpn_cdn}ovpn_udp/servers/" nordvpn_cdn="${nordvpn_cdn}ovpn_udp/servers/"
elif [[ ${NORDVPN_PROTOCOL,,} =~ tcp ]];then elif [[ ${NORDVPN_PROTOCOL,,} == tcp ]];then
nordvpn_cdn="${nordvpn_cdn}ovpn_tcp/servers/" nordvpn_cdn="${nordvpn_cdn}ovpn_tcp/servers/"
fi fi
@@ -100,6 +100,7 @@ download_hostname() {
fi fi
log "Downloading config: ${ovpnName}" log "Downloading config: ${ovpnName}"
log "Downloading from: ${nordvpn_cdn}"
curl ${nordvpn_cdn} -o "${ovpnName}" curl ${nordvpn_cdn} -o "${ovpnName}"
} }
update_hostname() { update_hostname() {
@@ -134,6 +135,7 @@ then
selected="default" selected="default"
elif [[ ${1} == "--openvpn-config" ]] || [[ ${1} == "-o" ]] elif [[ ${1} == "--openvpn-config" ]] || [[ ${1} == "-o" ]]
then then
log "Using OpenVPN CONFIG :: ${OPENVPN_CONFIG,,}"
download_hostname ${OPENVPN_CONFIG,,} download_hostname ${OPENVPN_CONFIG,,}
elif [[ ! -z $NORDVPN_COUNTRY ]] elif [[ ! -z $NORDVPN_COUNTRY ]]
then then

4
openvpn/start.sh
View File

@@ -43,7 +43,9 @@ then
if [[ ! -z $OPENVPN_CONFIG ]] if [[ ! -z $OPENVPN_CONFIG ]]
then then
export NORDVPN_CATEGORY="${OPENVPN_CONFIG##*.^^}" tmp_Protocol="${OPENVPN_CONFIG##*.}"
export NORDVPN_PROTOCOL=${tmp_Protocol^^}
echo "Setting NORDVPN_PROTOCOL to: ${NORDVPN_PROTOCOL}"
${VPN_PROVIDER_CONFIGS}/updateConfigs.sh --openvpn-config ${VPN_PROVIDER_CONFIGS}/updateConfigs.sh --openvpn-config
elif [[ ! -z $NORDVPN_COUNTRY ]] elif [[ ! -z $NORDVPN_COUNTRY ]]
then then