Index: /branches/releng-9.0/nanobsd/files/etc/newsyslog.conf
===================================================================
--- /branches/releng-9.0/nanobsd/files/etc/newsyslog.conf	(revision 10472)
+++ /branches/releng-9.0/nanobsd/files/etc/newsyslog.conf	(revision 10481)
@@ -42,6 +42,6 @@
 #
 /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
Index: /branches/releng-9.0/nanobsd/files/etc/rc.conf
===================================================================
--- /branches/releng-9.0/nanobsd/files/etc/rc.conf	(revision 10472)
+++ /branches/releng-9.0/nanobsd/files/etc/rc.conf	(revision 10481)
@@ -31,5 +31,5 @@
 nrpe2_enable="YES"
 snmpd_enable="YES"
-snmpd_flags="-a -LF w /var/log/snmpd.log"
+snmpd_flags="-LS w"
 
 # HTTP(S) proxy server
Index: /branches/releng-9.0/nanobsd/files/etc/syslog.conf
===================================================================
--- /branches/releng-9.0/nanobsd/files/etc/syslog.conf	(revision 10472)
+++ /branches/releng-9.0/nanobsd/files/etc/syslog.conf	(revision 10481)
@@ -35,2 +35,6 @@
 !openvpn
 *.*						/var/log/openvpn.log
+!tinyproxy
+*.*						/var/log/tinyproxy.log
+!snmpd
+*.*						/var/log/snmpd.log
Index: /branches/releng-9.0/nanobsd/files/usr/local/etc/tinyproxy.conf
===================================================================
--- /branches/releng-9.0/nanobsd/files/usr/local/etc/tinyproxy.conf	(revision 10472)
+++ /branches/releng-9.0/nanobsd/files/usr/local/etc/tinyproxy.conf	(revision 10481)
@@ -20,5 +20,5 @@
 #
 #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,6 +65,6 @@
 # but not both.
 #
-Logfile "/var/log/tinyproxy.log"
-# Syslog On
+#Logfile "/var/log/tinyproxy.log"
+Syslog On
 
 #
@@ -226,3 +226,3 @@
 #
 ConnectPort 443
-ConnectPort 563
+#ConnectPort 563
Index: /branches/releng-9.0/nanobsd/files/usr/local/sbin/check-inet-alive
===================================================================
--- /branches/releng-9.0/nanobsd/files/usr/local/sbin/check-inet-alive	(revision 10472)
+++ /branches/releng-9.0/nanobsd/files/usr/local/sbin/check-inet-alive	(revision 10481)
@@ -9,17 +9,8 @@
 # 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,10 +18,14 @@
 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,2 +35,14 @@
   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