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

genconfig: Convert OVPN_ROUTES to array

Browse Source 
* Convert to an array to simplify the code.
* This breaks running `ovpn_genconfig` multiple times with the same
  route argument as the array will just grow.  This needs to be fixed in
  the future.
* Recommended way to work around this is to remove ovpn_env.sh.
This commit is contained in:
Kyle Manna 2014-07-09 10:34:39 -07:00
parent 20be0f90a5
commit b9cc5b347a
2 changed files with 7 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
bin/ovpn_genconfig
View File

@ -48,23 +48,17 @@ 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_ROUTES=()
OVPN_PUSH=() OVPN_PUSH=()
# Import defaults if present # Import defaults if present
[ -r "$OVPN_ENV" ] && source "$OVPN_ENV" [ -r "$OVPN_ENV" ] && source "$OVPN_ENV"
ORIG_OVPN_ROUTES=$OVPN_ROUTES
OVPN_ROUTES=""
# Parse arguments # Parse arguments
while getopts ":r:s:du:cp:" opt; do while getopts ":r:s:du:cp:" opt; do
case $opt in case $opt in
r) r)
if [ -n "$OVPN_ROUTES" ]; then OVPN_ROUTES+=("$OPTARG")
OVPN_ROUTES+=" $OPTARG"
else
OVPN_ROUTES+="$OPTARG"
fi
;; ;;
s) s)
OVPN_SERVER=$OPTARG OVPN_SERVER=$OPTARG
@ -112,14 +106,7 @@ fi
# Apply defaults # Apply defaults
[ -z "$OVPN_PROTO" ] && OVPN_PROTO=udp [ -z "$OVPN_PROTO" ] && OVPN_PROTO=udp
[ -z "$OVPN_PORT" ] && OVPN_PORT=1194 [ -z "$OVPN_PORT" ] && OVPN_PORT=1194
[ ${#OVPN_ROUTES[@]} -eq 0 ] && OVPN_ROUTES=("192.168.254.0/24")
if [ -z "$OVPN_ROUTES" ]; then
if [ -n "$ORIG_OVPN_ROUTES" ]; then
OVPN_ROUTES=$ORIG_OVPN_ROUTES
else
OVPN_ROUTES=192.168.254.0/24
fi
fi
export OVPN_SERVER OVPN_ROUTES OVPN_DEFROUTE export OVPN_SERVER OVPN_ROUTES OVPN_DEFROUTE
export OVPN_SERVER_URL OVPN_ENV OVPN_PROTO OVPN_CN OVPN_PORT export OVPN_SERVER_URL OVPN_ENV OVPN_PROTO OVPN_CN OVPN_PORT
@ -168,10 +155,10 @@ EOF
[ -n "$OVPN_CLIENT_TO_CLIENT" ] && echo "client-to-client" >> "$conf" [ -n "$OVPN_CLIENT_TO_CLIENT" ] && echo "client-to-client" >> "$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
[ "$i" = "0" ] && break; [ "$i" = "0" ] && break;
echo route $(getroute $i) >> "$conf" echo route $(getroute "$i") >> "$conf"
done done
# Append push commands # Append push commands

4
bin/ovpn_run
View File

@ -21,8 +21,8 @@ fi
if [ "$OVPN_DEFROUTE" != "0" ];then if [ "$OVPN_DEFROUTE" != "0" ];then
iptables -t nat -A POSTROUTING -s $OVPN_SERVER -o eth0 -j MASQUERADE iptables -t nat -A POSTROUTING -s $OVPN_SERVER -o eth0 -j MASQUERADE
for i in ${OVPN_ROUTES[@]}; do for i in "${OVPN_ROUTES[@]}"; do
iptables -t nat -A POSTROUTING -s $i -o eth0 -j MASQUERADE iptables -t nat -A POSTROUTING -s "$i" -o eth0 -j MASQUERADE
done done
fi fi