diff options
| author | Martin Schwenke <martin@meltin.net> | 2012-07-17 15:32:38 +1000 |
|---|---|---|
| committer | Amitay Isaacs <amitay@gmail.com> | 2012-07-26 21:14:57 +1000 |
| commit | 9a7a1991321a16129c681b1b6ffc91ac2fbcdb8b (patch) | |
| tree | 5f16a93683efb36b49e72947991ab46fc2ec299a | |
| parent | 573fb0497a0dd253a1c08fb4d72387c90861ded1 (diff) | |
| download | samba-9a7a1991321a16129c681b1b6ffc91ac2fbcdb8b.tar.gz samba-9a7a1991321a16129c681b1b6ffc91ac2fbcdb8b.tar.xz samba-9a7a1991321a16129c681b1b6ffc91ac2fbcdb8b.zip | |
Eventscripts: Clean up startup sanity check in 11.natgw
Signed-off-by: Martin Schwenke <martin@meltin.net>
(This used to be ctdb commit f6e421e8bf935cae790a6dc2b861eb9c7f8610b4)
| -rwxr-xr-x | ctdb/config/events.d/11.natgw | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/ctdb/config/events.d/11.natgw b/ctdb/config/events.d/11.natgw index 6a0fa39d11..d06ca16227 100755 --- a/ctdb/config/events.d/11.natgw +++ b/ctdb/config/events.d/11.natgw @@ -36,14 +36,9 @@ delete_all() { case "$1" in startup) - [ -z "$CTDB_PUBLIC_ADDRESSES" ] && { - CTDB_PUBLIC_ADDRESSES=/etc/ctdb/public_addresses - } - egrep "^$CTDB_NATGW_PUBLIC_IP[ \t]" $CTDB_PUBLIC_ADDRESSES >/dev/null - [ "$?" = "0" ] && { - echo ERROR: NATGW configured to use a public address. NATGW must not use a public address. - exit 1 - } + # Error if CTDB_NATGW_PUBLIC_IP is listed in public addresses + grep -q "^$CTDB_NATGW_PUBLIC_IP[[:space:]]" "${CTDB_PUBLIC_ADDRESSES:-/etc/ctdb/public_addresses}" && \ + die "ERROR: NATGW configured to use a public address. NATGW must not use a public address." # do not send out arp requests from loopback addresses echo 2 > /proc/sys/net/ipv4/conf/all/arp_announce |