Changeset 10481 in hybrid for branches/releng-9.0

Timestamp:

Apr 13, 2012, 6:54:31 PM (13 years ago)

Author:

rick

Message:

Logging configs and check fixes:

• Network Status file.

• TinyProxy binding and Sylog logging.

• SNMPD syslog logging.

Location:

branches/releng-9.0/nanobsd/files

Files:

• etc/newsyslog.conf (modified) (1 diff)
• etc/rc.conf (modified) (1 diff)
• etc/syslog.conf (modified) (1 diff)
• usr/local/etc/tinyproxy.conf (modified) (3 diffs)
• usr/local/sbin/check-inet-alive (modified) (3 diffs)

branches/releng-9.0/nanobsd/files/etc/newsyslog.conf

@@ -42 +42 @@
 #
 /var/log/wlportal.log                   664  3     100  *     J /var/run/wlportal.pid
-/var/log/snmpd.log                      644  3     100  *     J /var/run/snmpd.pid
+/var/log/snmpd.log                      644  3     100  *     J
 /var/log/thttpd.log                     644  3     100  *     J
-/var/log/pen_wrapper.log                644  3     100  *     J
 /var/log/openvpn.log                    644  3     100  *     J
+/var/log/tinyproxy.log                  644  3     100  *     J

branches/releng-9.0/nanobsd/files/etc/rc.conf

@@ -31 +31 @@
 nrpe2_enable="YES"
 snmpd_enable="YES"
-snmpd_flags="-a -LF w /var/log/snmpd.log"
+snmpd_flags="-LS w"
 
 # HTTP(S) proxy server

branches/releng-9.0/nanobsd/files/etc/syslog.conf

@@ -35 +35 @@
 !openvpn
 *.*                                             /var/log/openvpn.log
+!tinyproxy
+*.*                                             /var/log/tinyproxy.log
+!snmpd
+*.*                                             /var/log/snmpd.log

branches/releng-9.0/nanobsd/files/usr/local/etc/tinyproxy.conf

@@ -20 +20 @@
 #
 #Listen 192.168.0.1
-Listen 0.0.0.0 
+Listen 172.31.255.1:3128
 #
 # The Bind directive allows you to bind the outgoing connections to a
@@ -65 +65 @@
 # but not both.
 #
-Logfile "/var/log/tinyproxy.log"
-# Syslog On
+#Logfile "/var/log/tinyproxy.log"
+Syslog On
 
 #
@@ -226 +226 @@
 #
 ConnectPort 443
-ConnectPort 563
+#ConnectPort 563

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

@@ -9 +9 @@
 # XXX: Do we need to manage state, like DHCP here?
 # XXX: Check if page output is actually the output expected and not some weird captive portal somewhere.
+# XXX: For effiently reasons this should be combined with the nagios check_inet check
 # 
 # Rick van der Zwet <info@rickvanderzwet.nl>
 #
-
-# Check if we need to check inet at all
-. /etc/rc.subr
-load_rc_config "lvrouted"
-: ${lvouted_enable="NO"}
-: ${service_ileiden="NO"}
-: ${service_proxy="NO"}
-(( checkyesno service_ileiden || checkyesno service_proxy ) && checkyesno lvouted_enable ) || exit 0
-
-
 
 TAG=`basename $0`
@@ -27 +18 @@
 service lvrouted onestatus > /dev/null && LVROUTED_STATUS="running" || LVROUTED_STATUS="stopped"
 
+check_http() {
+ fetch -o /dev/null -q $* 2>/dev/null
+}
+
 # Main I-net check
-fetch -o /dev/null -q http://proxy-test.wirelessleiden.nl && INET_STATUS=up
+check_http http://proxy-test.wirelessleiden.nl && INET_STATUS=up
 
 if [ $INET_STATUS = "down" ]; then
   # Failback internet check
-  fetch -o /dev/null http://ams-ix.net && INET_STATUS=up
+  check_http http://ams-ix.net && INET_STATUS=up
 fi
 
@@ -40 +35 @@
   service lvrouted stop | logger -t "$TAG"
 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