X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=modules%2Fsudo%2Ffiles%2Fcommon%2Fsudoers;h=2d64b54c914f063b9768098126366dbffb389e3d;hb=bbc4925df1547a2129f4402acb3e1c1f1e882293;hp=22744e6104f6f58b40a5038d4f493519b1630aa7;hpb=6bb18887fadec1c097c7cb5cded51a4be3ac307c;p=mirror%2Fdsa-puppet.git

diff --git a/modules/sudo/files/common/sudoers b/modules/sudo/files/common/sudoers
index 22744e610..2d64b54c9 100644
--- a/modules/sudo/files/common/sudoers
+++ b/modules/sudo/files/common/sudoers
@@ -31,7 +31,7 @@ root	ALL=(ALL) ALL
 
 # DSA and local admins
 %adm		ALL=(ALL)	ALL
-%adm		ALL=(ALL)	NOPASSWD: /usr/bin/apt-get update, /usr/bin/apt-get dist-upgrade, /usr/bin/apt-get clean, /usr/sbin/samhain -t check -i -p err -s none -l none -m none
+%adm		ALL=(ALL)	NOPASSWD: /usr/bin/apt-get update, /usr/bin/apt-get dist-upgrade, /usr/bin/apt-get clean, /usr/sbin/samhain -t check -i -p err -s none -l none -m none, /usr/sbin/upgrade-porter-chroots
 
 # nagios
 nagios		ALL=(ALL)	NOPASSWD: /usr/lib/nagios/plugins/dsa-check-dabackup ""
@@ -45,6 +45,7 @@ nagios		ALL=(ALL)	NOPASSWD: /usr/sbin/hpacucli controller slot=0 show status
 
 # groups and their role accounts
 %mirroradm	ALL=(archvsync)	ALL
+%wikiadm	ALL=(wiki)	ALL
 
 # some groups are in apachectrl on "their" hosts so they can reload apache and update their vhost
 %apachectrl	ALL=(root)	/usr/sbin/apache2-vhost-update