sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-23 06:50:21 +03:00
Code

Eventscripts: Retrieve and build NAT gateway details better in 11.natgw

Browse Source 
* "ctdb natgw" is run twice when it doesn't need to be.

* Tweak the parsing of "ctdb natgw" output so that it is done by the
  shell instead of a bunch of external processes.

* Make default NAT gateway be -1, even on error.  If the process
  failed entirely then it could previously be empty.

* Streamline the error handling using die() for when there is no NAT
  gateway.

* Downcase script-local variable names.

Signed-off-by: Martin Schwenke <martin@meltin.net>

(This used to be ctdb commit 630cfe6451ba23d959fa4907fbba42702337ed3b)
This commit is contained in:
Martin Schwenke 2012-07-17 15:39:50 +10:00 committed by Amitay Isaacs
parent e7325ebcd5
commit 05359689f6
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
ctdb/config/events.d/11.natgw
View File

@ -45,18 +45,17 @@ case "$1" in
;;
recovered|updatenatgw|ipreallocated)
MYPNN=`ctdb pnn | cut -d: -f2`
NATGWMASTER=`ctdb natgwlist | head -1 | sed -e "s/ .*//"`
NATGWIP=`ctdb natgwlist | head -1 | sed -e "s/^[^ ]* *//"`
mypnn=$(ctdb pnn | cut -d: -f2)
if [ "$NATGWMASTER" = "-1" ]; then
echo "There is no NATGW master node"
exit 1
fi
set -- $(ctdb natgwlist)
natgwmaster="${1:--1}" # Default is -1 if natgwlist fails
natgwip="$2"
[ "$natgwmaster" = "-1" ] && die "There is no NATGW master node"
delete_all
if [ "$MYPNN" = "$NATGWMASTER" ]; then
if [ "$mypnn" = "$natgwmaster" ]; then
# This is the first node, set it up as the NAT GW
echo 1 >/proc/sys/net/ipv4/ip_forward
iptables -A POSTROUTING -t nat -s $CTDB_NATGW_PRIVATE_NETWORK ! -d $CTDB_NATGW_PRIVATE_NETWORK -j MASQUERADE
@ -75,7 +74,7 @@ case "$1" in
# We do this so that the ip address will exist on a
# non-loopback interface so that samba may send it along in the
# KDC requests.
ip route add 0.0.0.0/0 via $NATGWIP metric 10
ip route add 0.0.0.0/0 via $natgwip metric 10
# Make sure winbindd does not stay bound to this address
# if we are no longer natgwmaster
smbcontrol winbindd ip-dropped $CTDB_NATGW_PUBLIC_IP >/dev/null 2>/dev/null