From 8f304ea3fe58b3fc2582c630c4ae1784cc0f04e0 Mon Sep 17 00:00:00 2001 From: Jan Kunzmann Date: Wed, 25 Jan 2017 01:25:08 +0100 Subject: [PATCH] bugfix: custom route definition didn't override default --- bin/ovpn_genconfig | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/bin/ovpn_genconfig b/bin/ovpn_genconfig index a8b595f..4cb435e 100755 --- a/bin/ovpn_genconfig +++ b/bin/ovpn_genconfig @@ -4,8 +4,6 @@ # Generate OpenVPN configs # -USE_DEFAULT_ROUTE=true - TMP_PUSH_CONFIGFILE=$(mktemp -t vpn_push.XXXXXXX) TMP_ROUTE_CONFIGFILE=$(mktemp -t vpn_route.XXXXXXX) TMP_EXTRA_CONFIGFILE=$(mktemp -t vpn_extra.XXXXXXX) @@ -155,6 +153,7 @@ OVPN_TLS_CIPHER='' OVPN_CIPHER='' OVPN_AUTH='' OVPN_EXTRA_CONFIG='' +CUSTOM_ROUTE_CONFIG='' # Import defaults if present [ -r "$OVPN_ENV" ] && source "$OVPN_ENV" @@ -175,7 +174,7 @@ while getopts ":a:e:C:T:r:s:du:cp:n:DNmf:tz2" opt; do OVPN_TLS_CIPHER="$OPTARG" ;; r) - USE_DEFAULT_ROUTE=false + CUSTOM_ROUTE_CONFIG=1 process_route_config "$OPTARG" ;; s) @@ -253,7 +252,7 @@ fi # Apply defaults [ -z "$OVPN_PROTO" ] && OVPN_PROTO=udp [ -z "$OVPN_PORT" ] && OVPN_PORT=1194 -[ $USE_DEFAULT_ROUTE ] && process_route_config "192.168.254.0/24" +[ -z "$CUSTOM_ROUTE_CONFIG" ] && process_route_config "192.168.254.0/24" export OVPN_SERVER OVPN_ROUTES OVPN_DEFROUTE export OVPN_SERVER_URL OVPN_ENV OVPN_PROTO OVPN_CN OVPN_PORT