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

Control default DNS push with -D flag

Browse Source
This commit is contained in:
Omri Iluz 2015-01-17 00:56:21 -08:00
parent bf50da4ee2
commit 97f231b4e7
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
bin/ovpn_genconfig
View File

@ -41,6 +41,7 @@ usage() {
echo "optional arguments:" echo "optional arguments:"
echo " -d Disable NAT routing and default route" echo " -d Disable NAT routing and default route"
echo " -c Enable client-to-client option" echo " -c Enable client-to-client option"
echo " -D Disable built in external dns (google dns)"
} }
set -ex set -ex
@ -48,6 +49,7 @@ set -ex
OVPN_ENV=$OPENVPN/ovpn_env.sh OVPN_ENV=$OPENVPN/ovpn_env.sh
OVPN_SERVER=192.168.255.0/24 OVPN_SERVER=192.168.255.0/24
OVPN_DEFROUTE=1 OVPN_DEFROUTE=1
OVPN_DNS=1
OVPN_ROUTES=() OVPN_ROUTES=()
OVPN_PUSH=() OVPN_PUSH=()
@ -55,7 +57,7 @@ OVPN_PUSH=()
[ -r "$OVPN_ENV" ] && source "$OVPN_ENV" [ -r "$OVPN_ENV" ] && source "$OVPN_ENV"
# Parse arguments # Parse arguments
while getopts ":r:s:du:cp:" opt; do while getopts ":r:s:du:cp:D" opt; do
case $opt in case $opt in
r) r)
OVPN_ROUTES+=("$OPTARG") OVPN_ROUTES+=("$OPTARG")
@ -75,6 +77,9 @@ while getopts ":r:s:du:cp:" opt; do
p) p)
OVPN_PUSH+=("$OPTARG") OVPN_PUSH+=("$OPTARG")
;; ;;
D)
OVPN_DNS=0
;;
\?) \?)
set +x set +x
echo "Invalid option: -$OPTARG" >&2 echo "Invalid option: -$OPTARG" >&2
@ -140,8 +145,6 @@ key-direction 0
keepalive 10 60 keepalive 10 60
persist-key persist-key
persist-tun persist-tun
#push "dhcp-option DNS 8.8.4.4"
#push "dhcp-option DNS 8.8.8.8"
proto $OVPN_PROTO proto $OVPN_PROTO
# Rely on Docker to do port mapping, internally always 1194 # Rely on Docker to do port mapping, internally always 1194
@ -156,7 +159,8 @@ group nogroup
EOF EOF
[ -n "$OVPN_CLIENT_TO_CLIENT" ] && echo "client-to-client" >> "$conf" [ -n "$OVPN_CLIENT_TO_CLIENT" ] && echo "client-to-client" >> "$conf"
[ "$OVPN_DNS" == "1" ] && echo push "dhcp-option DNS 8.8.4.4" >> "$conf"
[ "$OVPN_DNS" == "1" ] && echo push "dhcp-option DNS 8.8.8.8" >> "$conf"
# Append Routes # Append Routes
for i in "${OVPN_ROUTES[@]}"; do for i in "${OVPN_ROUTES[@]}"; do
# If user passed "0" skip this, assume no extra routes # If user passed "0" skip this, assume no extra routes