From: Evan Broder <broder@mit.edu>
Date: Tue, 25 Nov 2008 13:10:09 +0000 (-0500)
Subject: Don't just keep adding to the sudoers file in xvm-munin-config
X-Git-Tag: 0.0.2^0
X-Git-Url: http://xvm.mit.edu/gitweb/invirt/packages/xvm-munin-config.git/commitdiff_plain/54ac87f30ffb5787f4bf02a6c7bd7f44f8313e39?hp=56328c0b20eb97049d9552298ac41f316a445a47

Don't just keep adding to the sudoers file in xvm-munin-config

svn path=/trunk/packages/xvm-munin-config/; revision=1767
---

diff --git a/debian/changelog b/debian/changelog
index a2f14fe..46ddb36 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+xvm-munin-config (0.0.2) unstable; urgency=low
+
+  [ Quentin Smith ]
+  * Add a monitoring script for domain CPU utilization
+  
+  [ Evan Broder ]
+  * Don't just keep adding to the sudoers file
+
+ -- Evan Broder <broder@mit.edu>  Tue, 25 Nov 2008 08:08:26 -0500
+
 xvm-munin-config (0.0.1) unstable; urgency=low
 
   * Initial Release.
diff --git a/debian/xvm-munin-console-config.postinst b/debian/xvm-munin-console-config.postinst
index e19832a..c992d7f 100755
--- a/debian/xvm-munin-console-config.postinst
+++ b/debian/xvm-munin-console-config.postinst
@@ -23,6 +23,9 @@ case "$1" in
         # So munin can read the mail log
         adduser munin adm
         
+        # First clear out the old stuff we threw in /etc/sudoers
+        perl -i.bak -ne 's%^### (BEGIN|END) xvm-munin-config\s*$%%m && ($skip = ($1 eq "BEGIN")); print unless $skip;' /etc/sudoers
+        
         # So munin can sudo to get to postfix queue info
         cat >>/etc/sudoers <<EOF
 ### BEGIN xvm-munin-config
diff --git a/debian/xvm-munin-host-config.postinst b/debian/xvm-munin-host-config.postinst
index ce981db..3dbbeb6 100755
--- a/debian/xvm-munin-host-config.postinst
+++ b/debian/xvm-munin-host-config.postinst
@@ -23,7 +23,12 @@ case "$1" in
         # So munin can read the mail log
         adduser munin adm
         
+        # First clear out the old stuff we threw in /etc/sudoers
+        perl -i.bak -ne 's%^### (BEGIN|END) xvm-munin-config\s*$%%m && ($skip = ($1 eq "BEGIN")); print unless $skip;' /etc/sudoers
+        
         # 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
diff --git a/debian/xvm-munin-master-config.postinst b/debian/xvm-munin-master-config.postinst
index 721e584..407cbef 100755
--- a/debian/xvm-munin-master-config.postinst
+++ b/debian/xvm-munin-master-config.postinst
@@ -23,6 +23,9 @@ case "$1" in
         # So munin can read the mail log
         adduser munin adm
         
+        # First clear out the old stuff we threw in /etc/sudoers
+        perl -i.bak -ne 's%^### (BEGIN|END) xvm-munin-config\s*$%%m && ($skip = ($1 eq "BEGIN")); print unless $skip;' /etc/sudoers
+        
         # So munin can sudo to get to postfix queue info
         cat >>/etc/sudoers <<EOF
 ### BEGIN xvm-munin-config
diff --git a/debian/xvm-munin-remote-config.postinst b/debian/xvm-munin-remote-config.postinst
index e19832a..c992d7f 100755
--- a/debian/xvm-munin-remote-config.postinst
+++ b/debian/xvm-munin-remote-config.postinst
@@ -23,6 +23,9 @@ case "$1" in
         # So munin can read the mail log
         adduser munin adm
         
+        # First clear out the old stuff we threw in /etc/sudoers
+        perl -i.bak -ne 's%^### (BEGIN|END) xvm-munin-config\s*$%%m && ($skip = ($1 eq "BEGIN")); print unless $skip;' /etc/sudoers
+        
         # So munin can sudo to get to postfix queue info
         cat >>/etc/sudoers <<EOF
 ### BEGIN xvm-munin-config