From: Quentin Smith <quentin@mit.edu>
Date: Mon, 6 Jan 2014 07:10:58 +0000 (-0500)
Subject: Use /etc/sudoers.d now that it exists, instead of appending to /etc/sudoers
X-Git-Tag: 0.0.18~5
X-Git-Url: http://xvm.mit.edu/gitweb/invirt/packages/xvm-munin-config.git/commitdiff_plain/c80754854c1ed11ac2400c5a20ac003283f28e3e?ds=sidebyside

Use /etc/sudoers.d now that it exists, instead of appending to /etc/sudoers
---

diff --git a/console/etc/sudoers.d/xvm-munin-console-config b/console/etc/sudoers.d/xvm-munin-console-config
new file mode 100644
index 0000000..7364157
--- /dev/null
+++ b/console/etc/sudoers.d/xvm-munin-console-config
@@ -0,0 +1,3 @@
+# So munin can sudo to get to postfix queue info
+munin ALL=(postfix) SETENV: NOPASSWD: /etc/munin/plugins/postfix_mailqueue
+munin ALL=(munin) SETENV: NOPASSWD: ALL
diff --git a/debian/changelog b/debian/changelog
index 32499c9..a5d2ebe 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,10 @@
 xvm-munin-config (0.0.18) unstable; urgency=low
 
   * Add xen_net munin plugin for monitoring network status.
+  * Use /etc/sudoers.d now that it exists, instead of appending to
+    /etc/sudoers
 
- -- Quentin Smith <quentin@mit.edu>  Mon, 06 Jan 2014 01:41:38 -0500
+ -- Quentin Smith <quentin@mit.edu>  Mon, 06 Jan 2014 02:10:49 -0500
 
 xvm-munin-config (0.0.17) unstable; urgency=low
 
diff --git a/debian/xvm-munin-console-config.install b/debian/xvm-munin-console-config.install
index c0d3211..d164987 100644
--- a/debian/xvm-munin-console-config.install
+++ b/debian/xvm-munin-console-config.install
@@ -1,2 +1,3 @@
 common/* .
+console/* .
 debian/munin-node.conf.xvm.mako etc/munin
diff --git a/debian/xvm-munin-console-config.postinst b/debian/xvm-munin-console-config.postinst
index e19832a..2315c0b 100755
--- a/debian/xvm-munin-console-config.postinst
+++ b/debian/xvm-munin-console-config.postinst
@@ -23,14 +23,6 @@ case "$1" in
         # So munin can read the mail log
         adduser munin adm
         
-        # So munin can sudo to get to postfix queue info
-        cat >>/etc/sudoers <<EOF
-### BEGIN xvm-munin-config
-munin ALL=(postfix) SETENV: NOPASSWD: /etc/munin/plugins/postfix_mailqueue
-munin ALL=(munin) SETENV: NOPASSWD: ALL
-### END xvm-munin-config
-EOF
-        
         # Install munin plugins that are now configured
         munin-node-configure --suggest --shell | sh
         
diff --git a/debian/xvm-munin-host-config.postinst b/debian/xvm-munin-host-config.postinst
index b182729..890770a 100755
--- a/debian/xvm-munin-host-config.postinst
+++ b/debian/xvm-munin-host-config.postinst
@@ -23,17 +23,6 @@ case "$1" in
         # So munin can read the mail log
         adduser munin adm
         
-        # So munin can sudo to get to postfix queue info
-        # and smartctl info
-        # and info about running domains
-        cat >>/etc/sudoers <<EOF
-### BEGIN xvm-munin-config
-munin ALL=(postfix) SETENV: NOPASSWD: /etc/munin/plugins/postfix_mailqueue
-munin ALL=(munin) SETENV: NOPASSWD: ALL
-munin ALL=(root) SETENV: NOPASSWD: /etc/munin/plugins/hddtemp_smartctl , /etc/munin/plugins/smart_* , /etc/munin/plugins/xen_*
-### END xvm-munin-config
-EOF
-        
         # Install munin plugins that are now configured
         munin-node-configure --suggest --shell | sh
 
diff --git a/debian/xvm-munin-master-config.postinst b/debian/xvm-munin-master-config.postinst
index 721e584..2b8dfdf 100755
--- a/debian/xvm-munin-master-config.postinst
+++ b/debian/xvm-munin-master-config.postinst
@@ -22,15 +22,7 @@ case "$1" in
     configure)
         # So munin can read the mail log
         adduser munin adm
-        
-        # So munin can sudo to get to postfix queue info
-        cat >>/etc/sudoers <<EOF
-### BEGIN xvm-munin-config
-munin ALL=(postfix) SETENV: NOPASSWD: /etc/munin/plugins/postfix_mailqueue
-munin ALL=(munin) SETENV: NOPASSWD: ALL
-### END xvm-munin-config
-EOF
-        
+
         # So munin can read from the database
         su postgres -c 'createuser -S -D -R munin' || true
         su postgres -c 'psql invirt --quiet' <<EOF
diff --git a/debian/xvm-munin-remote-config.postinst b/debian/xvm-munin-remote-config.postinst
index e19832a..9b2918a 100755
--- a/debian/xvm-munin-remote-config.postinst
+++ b/debian/xvm-munin-remote-config.postinst
@@ -22,18 +22,10 @@ case "$1" in
     configure)
         # So munin can read the mail log
         adduser munin adm
-        
-        # So munin can sudo to get to postfix queue info
-        cat >>/etc/sudoers <<EOF
-### BEGIN xvm-munin-config
-munin ALL=(postfix) SETENV: NOPASSWD: /etc/munin/plugins/postfix_mailqueue
-munin ALL=(munin) SETENV: NOPASSWD: ALL
-### END xvm-munin-config
-EOF
-        
+
         # Install munin plugins that are now configured
         munin-node-configure --suggest --shell | sh
-        
+
         invoke-rc.d munin-node restart
     ;;
 
diff --git a/host/etc/sudoers.d/xvm-munin-host-config b/host/etc/sudoers.d/xvm-munin-host-config
new file mode 100644
index 0000000..40f2325
--- /dev/null
+++ b/host/etc/sudoers.d/xvm-munin-host-config
@@ -0,0 +1,6 @@
+# So munin can sudo to get to postfix queue info
+# and smartctl info
+# and info about running domains
+munin ALL=(postfix) SETENV: NOPASSWD: /etc/munin/plugins/postfix_mailqueue
+munin ALL=(munin) SETENV: NOPASSWD: ALL
+munin ALL=(root) SETENV: NOPASSWD: /etc/munin/plugins/hddtemp_smartctl , /etc/munin/plugins/smart_* , /etc/munin/plugins/xen_*
diff --git a/master/etc/sudoers.d/xvm-munin-master-config b/master/etc/sudoers.d/xvm-munin-master-config
new file mode 100644
index 0000000..7364157
--- /dev/null
+++ b/master/etc/sudoers.d/xvm-munin-master-config
@@ -0,0 +1,3 @@
+# So munin can sudo to get to postfix queue info
+munin ALL=(postfix) SETENV: NOPASSWD: /etc/munin/plugins/postfix_mailqueue
+munin ALL=(munin) SETENV: NOPASSWD: ALL
diff --git a/remote/etc/sudoers.d/xvm-munin-remote-config b/remote/etc/sudoers.d/xvm-munin-remote-config
new file mode 100644
index 0000000..7364157
--- /dev/null
+++ b/remote/etc/sudoers.d/xvm-munin-remote-config
@@ -0,0 +1,3 @@
+# So munin can sudo to get to postfix queue info
+munin ALL=(postfix) SETENV: NOPASSWD: /etc/munin/plugins/postfix_mailqueue
+munin ALL=(munin) SETENV: NOPASSWD: ALL