Some more munin hackery

Signed-off-by: Stephen Gran <steve@lobefin.net>

diff --git a/modules/munin-node/files/common/munin-node.plugin.conf b/modules/munin-node/files/common/munin-node.plugin.conf
new file mode 100644 (file)
index 0000000..7e48310
--- /dev/null
+++ b/modules/munin-node/files/common/munin-node.plugin.conf
@@ -0,0 +1,64 @@
+##
+## THIS FILE IS UNDER PUPPET CONTROL. DON'T EDIT IT HERE.
+## USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git
+##
+
+[apt]
+user root
+
+[courier_mta_mailqueue]
+group daemon
+
+[courier_mta_mailstats]
+group adm, maillog
+
+[courier_mta_mailvolume]
+group adm, maillog
+
+[cps*]
+user root
+
+[exim_mail*]
+group maillog
+
+[fw_conntrack]
+user root
+
+[fw_forwarded_local]
+user root
+
+[hddtemp_smartctl]
+user root
+
+[if_*]
+user root
+
+[if_err_*]
+user nobody
+
+[ip_*]
+user root
+
+[mysql*]
+user root
+env.mysqlopts --defaults-extra-file=/etc/mysql/debian.cnf
+
+[postfix_mailqueue]
+user (postfix)
+
+[postfix_mailstats]
+group adm, maillog
+
+[postfix_mailvolume]
+group adm, maillog
+env.logfile mail.log
+
+[smart_*]
+user root
+
+[vlan*]
+user root
+
+[spamassassin]
+group adm, maillog
+

diff --git a/modules/munin-node/manifests/init.pp b/modules/munin-node/manifests/init.pp
index 587f15774cc93b90536ea4c8596b044742d23752..947774334265f99606c18f3407f7b5a8693fd1dd 100644 (file)
--- a/modules/munin-node/manifests/init.pp
+++ b/modules/munin-node/manifests/init.pp
@@ -45,11 +45,18 @@ class munin-node {
         "vmstat":;
     }
 
-    file { "/etc/munin/munin-node.conf":
-        source  => [ "puppet:///munin-node/per-host/$fqdn/munin-node.conf",
-                     "puppet:///munin-node/common/munin-node.conf" ],
-        require => Package["munin-node"],
-        notify  => Exec["munin-node restart"],
+    file {
+        "/etc/munin/munin-node.conf":
+            source  => [ "puppet:///munin-node/per-host/$fqdn/munin-node.conf",
+                         "puppet:///munin-node/common/munin-node.conf" ],
+            require => Package["munin-node"],
+            notify  => Exec["munin-node restart"],
+
+        "/etc/munin/plugin-conf.d/munin-node":
+            source  => [ "puppet:///munin-node/per-host/$fqdn/munin-node.plugin.conf",
+                         "puppet:///munin-node/common/munin-node.plugin.conf" ],
+            require => Package["munin-node"],
+            notify  => Exec["munin-node restart"],
     }
 
     exec { "munin-node restart":

diff --git a/modules/samhain/templates/samhainrc.erb b/modules/samhain/templates/samhainrc.erb
index 60e0b2c7dd03caade5323741c1f7405beaff767b..7f85cd88c947105df3cb7fb7824466573dfc845f 100644 (file)
--- a/modules/samhain/templates/samhainrc.erb
+++ b/modules/samhain/templates/samhainrc.erb
@@ -115,6 +115,7 @@ files=/etc/apache2/mods-enabled
 file=/etc/samhain
 file=/etc/munin
 file=/etc/munin/plugins
+file=/etc/munin/plugin-conf.d
 file=/etc/exim4
 file=/etc/exim4/ssl
 file=/etc/apt
@@ -224,6 +225,7 @@ file=/etc/motd.tail
 file=/etc/ntp.conf
 file=/etc/samhain/samhainrc
 file=/etc/munin/munin-node.conf
+file=/etc/munin/plugin-conf.d/munin-node.conf
 file=/etc/userdir-ldap.confc
 file=/etc/exim4/blacklist
 file=/etc/exim4/host_blacklist