Index: /server/fedora/config/etc/munin/apache-htpasswd
===================================================================
--- /server/fedora/config/etc/munin/apache-htpasswd	(revision 846)
+++ /server/fedora/config/etc/munin/apache-htpasswd	(revision 847)
@@ -1,1 +1,2 @@
 munin:$apr1$OHrCw...$YROR8zbWmgxWL9netgXGi.
+geofft:AvCSyg9e75YZM
Index: /server/fedora/config/etc/munin/munin-node.conf
===================================================================
--- /server/fedora/config/etc/munin/munin-node.conf	(revision 846)
+++ /server/fedora/config/etc/munin/munin-node.conf	(revision 847)
@@ -12,6 +12,6 @@
 # Which port to bind to;
 host *
-user root
-group root
+user munin
+group munin
 setsid yes
 
Index: /server/fedora/config/etc/munin/plugin-conf.d/hddtemp_smartctl
===================================================================
--- /server/fedora/config/etc/munin/plugin-conf.d/hddtemp_smartctl	(revision 846)
+++ /server/fedora/config/etc/munin/plugin-conf.d/hddtemp_smartctl	(revision 847)
@@ -2,2 +2,3 @@
 user root
 env.drives sda sdb
+command sudo -E %c
Index: /server/fedora/config/etc/munin/plugin-conf.d/munin-node
===================================================================
--- /server/fedora/config/etc/munin/plugin-conf.d/munin-node	(revision 846)
+++ /server/fedora/config/etc/munin/plugin-conf.d/munin-node	(revision 847)
@@ -33,5 +33,8 @@
 [smart_*]
 user root
+command sudo %c
 
 [if_*]
 user root
+command sudo -E %c
+env.PATH /usr/kerberos/sbin:/usr/kerberos/bin:/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin:/root/bin
Index: /server/fedora/config/etc/munin/plugin-conf.d/postfix
===================================================================
--- /server/fedora/config/etc/munin/plugin-conf.d/postfix	(revision 847)
+++ /server/fedora/config/etc/munin/plugin-conf.d/postfix	(revision 847)
@@ -0,0 +1,5 @@
+[postfix*]
+user root
+env.logfile maillog
+env.logdir /var/log
+command sudo -E %c
Index: /server/fedora/config/etc/munin/plugin-conf.d/sendmail
===================================================================
--- /server/fedora/config/etc/munin/plugin-conf.d/sendmail	(revision 847)
+++ /server/fedora/config/etc/munin/plugin-conf.d/sendmail	(revision 847)
@@ -0,0 +1,4 @@
+[sendmail*]
+user root
+env.mspqueue /var/spool/clientmqueue
+command sudo -E %c
Index: /server/fedora/config/etc/sudoers
===================================================================
--- /server/fedora/config/etc/sudoers	(revision 846)
+++ /server/fedora/config/etc/sudoers	(revision 847)
@@ -71,2 +71,5 @@
 scripts	ALL=(signup)	NOPASSWD: /usr/local/bin/ldap-backup
 rebecca	ALL=(root)	NOPASSWD: /sbin/service nscd restart
+
+munin ALL=(root) SETENV: NOPASSWD: /etc/munin/plugins/postfix_mailqueue , /etc/munin/plugins/postfix_mailvolume , /etc/munin/plugins/hddtemp_smartctl , /etc/munin/plugins/sendmail* , /etc/munin/plugins/if_*
+munin ALL=(root) NOPASSWD: /etc/munin/plugins/smart_*
