Eventscripts: Optimise building the host address in 11.natgw
authorMartin Schwenke <martin@meltin.net>
Tue, 17 Jul 2012 05:37:14 +0000 (15:37 +1000)
committerAmitay Isaacs <amitay@gmail.com>
Thu, 26 Jul 2012 11:14:58 +0000 (21:14 +1000)
It can be build without forking unnecessary processes.

Also downcase variable name because it is local to script.

Signed-off-by: Martin Schwenke <martin@meltin.net>
config/events.d/11.natgw

index d06ca16227d9e0cb4e306e8da829d3dc22484378..8537a8cc0aede79543f78c500acfd176670d9c10 100755 (executable)
@@ -62,9 +62,9 @@ case "$1" in
                iptables -A POSTROUTING -t nat -s $CTDB_NATGW_PRIVATE_NETWORK ! -d $CTDB_NATGW_PRIVATE_NETWORK -j MASQUERADE
 
                # block all incoming connections to the natgw address
-               CTDB_NATGW_PUBLIC_IP_HOST=`echo $CTDB_NATGW_PUBLIC_IP | sed -e "s/\/.*/\/32/"`
-               iptables -D INPUT -p tcp --syn -d $CTDB_NATGW_PUBLIC_IP_HOST -j REJECT 2>/dev/null
-               iptables -I INPUT -p tcp --syn -d $CTDB_NATGW_PUBLIC_IP_HOST -j REJECT 2>/dev/null
+               ctdb_natgw_public_ip_host="${CTDB_NATGW_PUBLIC_IP%/*}/32"
+               iptables -D INPUT -p tcp --syn -d $ctdb_natgw_public_ip_host -j REJECT 2>/dev/null
+               iptables -I INPUT -p tcp --syn -d $ctdb_natgw_public_ip_host -j REJECT 2>/dev/null
 
                ip addr add $CTDB_NATGW_PUBLIC_IP dev $CTDB_NATGW_PUBLIC_IFACE
                ip route add 0.0.0.0/0 via $CTDB_NATGW_DEFAULT_GATEWAY >/dev/null 2>/dev/null