allanger/container-openvpn
1
0
Fork 0
Code Issues 4 Pull Requests Actions Packages Projects Releases Activity

do not accumulate routes and push directives from default if new directives were defined

Browse Source
This commit is contained in:
omriiluz 2015-02-28 03:01:00 -08:00
parent e9d1022eb4
commit 6b23cf8d88
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
bin/ovpn_genconfig
View File

@ -58,7 +58,9 @@ OVPN_DEFROUTE=1
OVPN_NAT=0 OVPN_NAT=0
OVPN_DNS=1 OVPN_DNS=1
OVPN_ROUTES=() OVPN_ROUTES=()
TMP_ROUTES=()
OVPN_PUSH=() OVPN_PUSH=()
TMP_PUSH=()
# Import defaults if present # Import defaults if present
[ -r "$OVPN_ENV" ] && source "$OVPN_ENV" [ -r "$OVPN_ENV" ] && source "$OVPN_ENV"
@ -67,7 +69,7 @@ OVPN_PUSH=()
while getopts ":r:s:du:cp:DNm:" opt; do while getopts ":r:s:du:cp:DNm:" opt; do
case $opt in case $opt in
r) r)
OVPN_ROUTES+=("$OPTARG") TMP_ROUTES+=("$OPTARG")
;; ;;
s) s)
OVPN_SERVER=$OPTARG OVPN_SERVER=$OPTARG
@ -82,7 +84,7 @@ while getopts ":r:s:du:cp:DNm:" opt; do
OVPN_CLIENT_TO_CLIENT=1 OVPN_CLIENT_TO_CLIENT=1
;; ;;
p) p)
OVPN_PUSH+=("$OPTARG") TMP_PUSH+=("$OPTARG")
;; ;;
D) D)
OVPN_DNS=0 OVPN_DNS=0
@ -108,6 +110,11 @@ while getopts ":r:s:du:cp:DNm:" opt; do
esac esac
done done
# if new routes were not defined with -r, use default
[ ${#TMP_ROUTES[@]} -gt 0 ] && OVPN_ROUTES=${TMP_ROUTES[@]}
# if new push directives were not defined with -p, use default
[ ${#TMP_PUSH[@]} -gt 0 ] && OVPN_PUSH=${TMP_PUSH[@]}
# Server name is in the form "udp://vpn.example.com:1194" # Server name is in the form "udp://vpn.example.com:1194"
if [[ "$OVPN_SERVER_URL" =~ ^((udp|tcp)://)?([0-9a-zA-Z\.\-]+)(:([0-9]+))?$ ]]; then if [[ "$OVPN_SERVER_URL" =~ ^((udp|tcp)://)?([0-9a-zA-Z\.\-]+)(:([0-9]+))?$ ]]; then