Index: trunk/packages/xvm-munin-config/debian/changelog
===================================================================
--- trunk/packages/xvm-munin-config/debian/changelog	(revision 1766)
+++ trunk/packages/xvm-munin-config/debian/changelog	(revision 1767)
@@ -1,2 +1,12 @@
+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
 
Index: trunk/packages/xvm-munin-config/debian/xvm-munin-console-config.postinst
===================================================================
--- trunk/packages/xvm-munin-config/debian/xvm-munin-console-config.postinst	(revision 1766)
+++ trunk/packages/xvm-munin-config/debian/xvm-munin-console-config.postinst	(revision 1767)
@@ -23,4 +23,7 @@
         # 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
Index: trunk/packages/xvm-munin-config/debian/xvm-munin-host-config.postinst
===================================================================
--- trunk/packages/xvm-munin-config/debian/xvm-munin-host-config.postinst	(revision 1766)
+++ trunk/packages/xvm-munin-config/debian/xvm-munin-host-config.postinst	(revision 1767)
@@ -24,5 +24,10 @@
         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
Index: trunk/packages/xvm-munin-config/debian/xvm-munin-master-config.postinst
===================================================================
--- trunk/packages/xvm-munin-config/debian/xvm-munin-master-config.postinst	(revision 1766)
+++ trunk/packages/xvm-munin-config/debian/xvm-munin-master-config.postinst	(revision 1767)
@@ -23,4 +23,7 @@
         # 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
Index: trunk/packages/xvm-munin-config/debian/xvm-munin-remote-config.postinst
===================================================================
--- trunk/packages/xvm-munin-config/debian/xvm-munin-remote-config.postinst	(revision 1766)
+++ trunk/packages/xvm-munin-config/debian/xvm-munin-remote-config.postinst	(revision 1767)
@@ -23,4 +23,7 @@
         # 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