[debian-edu-commits] r81183 - in branches/wheezy/debian-edu-config: debian etc/munin

[pere at alioth.debian.org]

Author: pere
Date: 2013-06-26 09:57:08 +0000 (Wed, 26 Jun 2013)
New Revision: 81183

Modified:
   branches/wheezy/debian-edu-config/debian/changelog
   branches/wheezy/debian-edu-config/etc/munin/debian-edu-munin-node.conf
Log:
Update munin-node.conf file to the version used in Wheezy, and add
our allow line to grant access to the main server.

Modified: branches/wheezy/debian-edu-config/debian/changelog
===================================================================
--- branches/wheezy/debian-edu-config/debian/changelog	2013-06-26 07:43:16 UTC (rev 81182)
+++ branches/wheezy/debian-edu-config/debian/changelog	2013-06-26 09:57:08 UTC (rev 81183)
@@ -5,6 +5,8 @@
     not the short name, to make sure Kerberos know which domain to use
     to find the realm and the Kerberos server.
   * Made DHCP hook to set hostname more robust.
+  * Update munin-node.conf file to the version used in Wheezy, and add
+    our allow line to grant access to the main server.
 
  -- Petter Reinholdtsen <pere at debian.org>  Wed, 26 Jun 2013 09:38:43 +0200
 

Modified: branches/wheezy/debian-edu-config/etc/munin/debian-edu-munin-node.conf
===================================================================
--- branches/wheezy/debian-edu-config/etc/munin/debian-edu-munin-node.conf	2013-06-26 07:43:16 UTC (rev 81182)
+++ branches/wheezy/debian-edu-config/etc/munin/debian-edu-munin-node.conf	2013-06-26 09:57:08 UTC (rev 81183)
@@ -4,24 +4,23 @@
 
 log_level 4
 log_file /var/log/munin/munin-node.log
-port 4949
 pid_file /var/run/munin/munin-node.pid
+
 background 1
-setseid 1
+setsid 1
 
-# Which port to bind to;
-host *
 user root
 group root
-setsid yes
 
+
 # Regexps for files to ignore
-
-ignore_file ~$
+ignore_file [\#~]$
+ignore_file DEADJOE$
 ignore_file \.bak$
 ignore_file %$
 ignore_file \.dpkg-(tmp|new|old|dist)$
 ignore_file \.rpm(save|new)$
+ignore_file \.pod$
 
 # Set this if the client doesn't report the correct hostname when
 # telnetting to localhost, port 4949
@@ -29,9 +28,30 @@
 #host_name localhost.localdomain
 
 # A list of addresses that are allowed to connect.  This must be a
-# regular expression, due to brain damage in Net::Server, which
-# doesn't understand CIDR-style network notation.  You may repeat
-# the allow line as many times as you'd like
+# regular expression, since Net::Server does not understand CIDR-style
+# network notation unless the perl module Net::CIDR is installed.  You
+# may repeat the allow line as many times as you'd like
 
 allow ^127\.0\.0\.1$
+allow ^::1$
+
+# Allow the Debian Edu main-server to connect
 allow ^10\.0\.2\.2$
+
+# If you have installed the Net::CIDR perl module, you can use one or more
+# cidr_allow and cidr_deny address/mask patterns.  A connecting client must
+# match any cidr_allow, and not match any cidr_deny.  Note that a netmask
+# *must* be provided, even if it's /32
+#
+# Example:
+#
+# cidr_allow 127.0.0.1/32
+# cidr_allow 192.0.2.0/24
+# cidr_deny  192.0.2.42/32
+
+# Which address to bind to;
+host *
+# host 127.0.0.1
+
+# And which port
+port 4949