Changeset 10483 in hybrid

Timestamp:

Apr 13, 2012, 7:18:42 PM (13 years ago)

Author:

rick

Message:

Control both tinyproxy and lvrouted

File:

• branches/releng-9.0/nanobsd/files/usr/local/sbin/check-inet-alive (modified) (2 diffs)

branches/releng-9.0/nanobsd/files/usr/local/sbin/check-inet-alive

@@ -15 +15 @@
 
 TAG=`basename $0`
-INET_STATUS=down
+logit() {
+  logger -t "$TAG" $*
+}
+
+# Check if we need to check inet at all
+. /etc/rc.subr
+load_rc_config "lvrouted"
+load_rc_config "tinyproxy"
+: ${lvouted_enable="NO"}
+: ${tinyproxy_enable="NO"}
+: ${service_ileiden="NO"}
+: ${service_proxy="NO"}
+
+control_lvrouted="yes"
+control_tinyproxy="yes"
+(( checkyesno service_ileiden || checkyesno service_proxy ) && checkyesno lvouted_enable ) || control_lvrouted="no"
+(( checkyesno service_ileiden || checkyesno service_proxy ) && checkyesno tinyproxy_enable ) || control_tinyproxy="no"
+
+
 service lvrouted onestatus > /dev/null && LVROUTED_STATUS="running" || LVROUTED_STATUS="stopped"
+service tinyproxy onestatus > /dev/null && TINYPROXY_STATUS="running" || TINYPROXY_STATUS="stopped"
 
 check_http() {
@@ -22 +41 @@
 }
 
-# Main I-net check
-check_http http://proxy-test.wirelessleiden.nl && INET_STATUS=up
+# Get connection stats for internet
+INET_STATUS=up && check_http http://proxy-test.wirelessleiden.nl || check_http http://ams-ix.net || INET_STATUS=down
+# Connections statistics for proxy
+export HTTP_PROXY=${HTTP_PROXY-:http://proxy.wleiden.net:3128}
+PROXY_STATUS=up && check_http http://tinyproxy.stats || check_http http://ams-ix.net || PROXY_STATUS=down
 
-if [ $INET_STATUS = "down" ]; then
-  # Failback internet check
-  check_http http://ams-ix.net && INET_STATUS=up
+# Log Network Status
+cat <<EOF > /tmp/network.status
+internet=$INET_STATUS
+echo proxy=$PROXY_STATUS
+EOF
+
+# Control connections
+if checkyesno control_lvrouted; then
+  if [ $LVROUTED_STATUS = "stopped" ] && [ $INET_STATUS = "up" ]; then
+    service lvrouted start | logit
+  elif [ $LVROUTED_STATUS = "running" ] && [ $INET_STATUS = "down" ]; then
+    service lvrouted stop | logit
+  fi
 fi
 
-if [ $LVROUTED_STATUS = "stopped" ] && [ $INET_STATUS = "up" ]; then
-  service lvrouted start | logger -t "$TAG"
-elif [ $LVROUTED_STATUS = "running" ] && [ $INET_STATUS = "down" ]; then
-  service lvrouted stop | logger -t "$TAG"
+if checkyesno control_tinyproxy; then
+  if [ $TINYPROXY_STATUS_STATUS = "stopped" ] && [ $INET_STATUS = "up" ]; then
+    service tinyproxy start | logit
+  elif [ $TINYPROXY_STATUS = "running" ] && [ $INET_STATUS = "down" ]; then
+    service tinyproxy stop | logit
+  fi
 fi
-
-# Retrieve proxy status
-export HTTP_PROXY=${HTTP_PROXY-:http://proxy.wleiden.net:3128}
-PROXY_STATUS=down
-check_http http://proxy-test.wirelessleiden.nl && PROXY_STATUS=down
-
-if [ $INET_STATUS = "down" ]; then
-  # Failback internet check
-  check_http http://ams-ix.net && PROXY_STATUS=up
-fi
-
-echo -e "internet=$INET_STATUS\nproxy=$PROXY_STATUS" > /tmp/network.status