diff --git a/openvpn/start.sh b/openvpn/start.sh index 7bb5e9d..de4b817 100755 --- a/openvpn/start.sh +++ b/openvpn/start.sh @@ -109,20 +109,6 @@ if [[ $VPN_ENABLED == "yes" ]]; then echo "[warn] NAME_SERVERS not defined (via -e NAME_SERVERS), defaulting to Google and FreeDNS name servers" | ts '%Y-%m-%d %H:%M:%.S' export NAME_SERVERS="8.8.8.8,37.235.1.174,8.8.4.4,37.235.1.177" fi - if [[ $VPN_PROV != "airvpn" ]]; then - export VPN_USER=$(echo "${VPN_USER}" | sed -e 's~^[ \t]*~~;s~[ \t]*$~~') - if [[ ! -z "${VPN_USER}" ]]; then - echo "[info] VPN_USER defined as '${VPN_USER}'" | ts '%Y-%m-%d %H:%M:%.S' - else - echo "[warn] VPN_USER not defined (via -e VPN_USER), assuming authentication via other method" | ts '%Y-%m-%d %H:%M:%.S' - fi - export VPN_PASS=$(echo "${VPN_PASS}" | sed -e 's~^[ \t]*~~;s~[ \t]*$~~') - if [[ ! -z "${VPN_PASS}" ]]; then - echo "[info] VPN_PASS defined as '${VPN_PASS}'" | ts '%Y-%m-%d %H:%M:%.S' - else - echo "[warn] VPN_PASS not defined (via -e VPN_PASS), assuming authentication via other method" | ts '%Y-%m-%d %H:%M:%.S' - fi - fi export VPN_OPTIONS=$(echo "${VPN_OPTIONS}" | sed -e 's~^[ \t]*~~;s~[ \t]*$~~') if [[ ! -z "${VPN_OPTIONS}" ]]; then echo "[info] VPN_OPTIONS defined as '${VPN_OPTIONS}'" | ts '%Y-%m-%d %H:%M:%.S' @@ -130,15 +116,6 @@ if [[ $VPN_ENABLED == "yes" ]]; then echo "[info] VPN_OPTIONS not defined (via -e VPN_OPTIONS)" | ts '%Y-%m-%d %H:%M:%.S' export VPN_OPTIONS="" fi - if [[ $VPN_PROV == "pia" ]]; then - export STRICT_PORT_FORWARD=$(echo "${STRICT_PORT_FORWARD}" | sed -e 's~^[ \t]*~~;s~[ \t]*$~~') - if [[ ! -z "${STRICT_PORT_FORWARD}" ]]; then - echo "[info] STRICT_PORT_FORWARD defined as '${STRICT_PORT_FORWARD}'" | ts '%Y-%m-%d %H:%M:%.S' - else - echo "[warn] STRICT_PORT_FORWARD not defined (via -e STRICT_PORT_FORWARD), defaulting to 'yes'" | ts '%Y-%m-%d %H:%M:%.S' - export STRICT_PORT_FORWARD="yes" - fi - fi elif [[ $VPN_ENABLED == "no" ]]; then echo "[warn] !!IMPORTANT!! You have set the VPN to disabled, you will NOT be secure!" | ts '%Y-%m-%d %H:%M:%.S' fi