admin/gluetun
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Moved all OpenVPN parameters to conf file + fixing AUTH_FAILED messages

Browse Source
This commit is contained in:
Quentin McGaw
2018-11-20 09:28:48 +02:00
parent 6c062eaee1
commit 0f02500a85
1 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
entrypoint.sh
View File

@@ -205,6 +205,19 @@ iptables -A OUTPUT -o tun0 -j ACCEPT
exitOnError $? exitOnError $?
printf "DONE\n" printf "DONE\n"
############################################
# Additional OpenVPN settings
############################################
cd "/openvpn/$PROTOCOL-$ENCRYPTION"
# Uses the username/password from this file to get the token from PIA
[ "$(grep "auth-user-pass /auth.conf" "$REGION.ovpn")" != "" ] || echo "auth-user-pass /auth.conf" >> "$REGION.ovpn"
# Reconnects automatically on failure
[ "$(grep "auth-retry nointeract" "$REGION.ovpn")" != "" ] || echo "auth-retry nointeract" >> "$REGION.ovpn"
# Prevents auth_failed infinite loops - make it interact? Remove persist-tun? nobind?
[ "$(grep "pull-filter ignore \"auth-token\"" "$REGION.ovpn")" != "" ] || echo "pull-filter ignore \"auth-token\"" >> "$REGION.ovpn"
# Runs openvpn without root, as nonrootuser
[ "$(grep "user nonrootuser" "$REGION.ovpn")" != "" ] || echo "user nonrootuser" >> "$REGION.ovpn"
############################################ ############################################
# OPENVPN LAUNCH # OPENVPN LAUNCH
############################################ ############################################
@@ -214,8 +227,8 @@ printf " * Encryption: $ENCRYPTION\n"
printf " * Protocol: $PROTOCOL\n" printf " * Protocol: $PROTOCOL\n"
printf " * Port: $PORT\n" printf " * Port: $PORT\n"
printf " * Initial VPN IP address: $(echo "$VPNIPS" | head -n 1)\n\n" printf " * Initial VPN IP address: $(echo "$VPNIPS" | head -n 1)\n\n"
cd "/openvpn/$PROTOCOL-$ENCRYPTION"
openvpn --config "$REGION.ovpn" --user nonrootuser --auth-retry nointeract --auth-user-pass /auth.conf openvpn --config "$REGION.ovpn"
status=$? status=$?
printf "\n =========================================\n" printf "\n =========================================\n"
printf " OpenVPN exit with status $status\n" printf " OpenVPN exit with status $status\n"