--- badi/public_scripts/switchgate/switchgate	2009/12/17 11:44:47	1.3
+++ badi/public_scripts/switchgate/switchgate	2010/08/18 10:40:25	1.6
@@ -18,7 +18,7 @@ DHCP_TMP_DIR=/tmp/switchgate
 
 # eMail address to send alert messages, if not operating on the
 # standard default gateway
-ALERT_EMAIL="adi@ente.limmat.ch"
+ALERT_EMAIL="adi@ente.limmat.ch, hauswartung@dasdreieck.ch"
 
 # Host set to ping. A file containing IP addresses, each on a single line.
 # Do not include any local hosts, list only hosts located behind your gateways.
@@ -28,7 +28,7 @@ HOSTSET_FILE="$CONFIG_PATH/hostset"
 GATEWAYS_FILE="$CONFIG_PATH/gateways"
 
 # path to fping
-PING=/usr/bin/fping
+PING=/usr/sbin/fping
 
 # answer of fping to reachable hosts
 ALIVE_ANSWER="is alive"
@@ -353,15 +353,17 @@ fi
 
 # send an eMail if the connection is down or limited
 if [ -z "$UP" ]; then
-	EMAIL_BODY="Switchgate on $(hostname -f) reports: No connection!\n\n\nTime:\t\t$(date)\nGateway:\t$CURRENTGW ($CURRENTGW_ID)"
-	EMAIL_SUBJECT="Attention: $(hostname -f) has no connection!"
-	echo -e "$EMAIL_BODY" | mail -s "$EMAIL_SUBJECT" "$ALERT_EMAIL"
-	if [[ -n "$DEBUG" && "$DEBUG" != "low" ]]; then
-		echo "Alert message sent to $ALERT_EMAIL."
+	if [ -z "$NEWGW" ]; then
+		EMAIL_BODY="Switchgate on $(hostname -f) reports: No connection!\n\nTime:\t\t$(date)\nGateway:\t$CURRENTGW ($CURRENTGW_ID)"
+		EMAIL_SUBJECT="Attention: $(hostname -f) has no connection!"
+		echo -e "$EMAIL_BODY" | mail -s "$EMAIL_SUBJECT" "$ALERT_EMAIL"
+		if [[ -n "$DEBUG" && "$DEBUG" != "low" ]]; then
+			echo "Alert message sent to $ALERT_EMAIL."
+		fi
 	fi
 elif [ "$CURRENTGW_ID" != 0 ]; then
-	EMAIL_BODY="Switchgate on $(hostname -f) reports: Not operating on standard default gateway!\n\n\nTime:\t\t$(date)\nGateway:\t$CURRENTGW ($CURRENTGW_ID)"
-	EMAIL_SUBJECT="Attention: $(hostname -f) Not operating on standard default gateway!"
+	EMAIL_BODY="Switchgate on $(hostname -f) reports: Not operating on standard default gateway!\n\nTime:\t\t$(date)\nGateway:\t$CURRENTGW ($CURRENTGW_ID)"
+	EMAIL_SUBJECT="Attention: $(hostname -f) not operating on standard default gateway!"
 	echo -e "$EMAIL_BODY" | mail -s "$EMAIL_SUBJECT" "$ALERT_EMAIL"
 	if [[ -n "$DEBUG" && "$DEBUG" != "low" ]]; then
 		echo "Alert message sent to $ALERT_EMAIL."
@@ -370,7 +372,7 @@ fi
 
 if [ "$DEBUG" = "low" ]; then
    echo
-   echo "Default Gateway: $CURRENTGW ($CURRENTGW_ID)"
+   echo "Current Default Gateway: $CURRENTGW ($CURRENTGW_ID)"
    echo
 fi
 exit 0