X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fsudo%2Ffiles%2Fsudoers;h=f899e3fb98ae33cf8e52615e6678b5ca11c3ae49;hb=808f1d318c43aaec1f3fcbfeab9571f93142e81a;hp=30f01bd7eead98382ca3be1c3ff3ba0d6f452b42;hpb=b1552db599ce298fecdc61d70e368c60e24b2c48;p=mirror%2Fdsa-puppet.git

diff --git a/modules/sudo/files/sudoers b/modules/sudo/files/sudoers
index 30f01bd7e..f899e3fb9 100644
--- a/modules/sudo/files/sudoers
+++ b/modules/sudo/files/sudoers
@@ -22,14 +22,14 @@ Defaults	passprompt="[sudo] password for %u on %h: "
 Defaults        secure_path="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
 
 # Host alias specification
-Host_Alias	QAHOSTS		= master, quantz, stabile
+Host_Alias	QAHOSTS		= quantz, stabile
 Host_Alias	WEBHOSTS	= wolkenstein
 Host_Alias	SECHOSTS	= chopin
 Host_Alias	FTPHOSTS	= franck, morricone
 Host_Alias	ZIVITHOSTS	= zelenka, zandonai
 Host_Alias	AACRAIDHOSTS	= bellini, morricone, paganini, respighi, beethoven, pettersson
 Host_Alias	MEGARAIDHOSTS	= grieg, rautavaara, sibelius
-Host_Alias	MPTRAIDHOSTS	= master, fasch, holter, barber, biber, cilea, vitry, krenek, orff
+Host_Alias	MPTRAIDHOSTS	= old-master, fasch, holter, barber, biber, cilea, vitry, krenek, orff
 Host_Alias	MEGACTLHOSTS	= lindberg, englund, nielsen
 Host_Alias  LISTHOSTS   = bendel
 
@@ -48,6 +48,7 @@ root	ALL=(ALL) ALL
 # nagios
 nagios		ALL=(ALL)	NOPASSWD: /etc/init.d/ekeyd-egd-linux restart
 nagios		ALL=(ALL)	NOPASSWD: /usr/lib/nagios/plugins/dsa-check-dabackup ""
+nagios		dinis=(ALL)	NOPASSWD: /usr/lib/nagios/plugins/dsa-check-bacula, /usr/lib/nagios/plugins/dsa-check-bacula-lastbackup-wrap
 nagios		ALL=(ALL)	NOPASSWD: /usr/lib/nagios/plugins/dsa-check-filesystems ""
 # with smartarray controllers
 nagios		ALL=(ALL)	NOPASSWD: /sbin/hpasmcli ""
@@ -111,12 +112,13 @@ nagios		beethoven=(debbackup)	NOPASSWD: /usr/lib/nagios/plugins/dsa-check-backup
 %volatile	ALL=(volatile)	ALL
 %wbadm		ALL=(wbadm)	ALL
 %mujeres	ALL=(women)	ALL
-%wikiadm	ALL=(wiki)	ALL
+%wikiadm	ALL=(wiki,wikiweb)	ALL
 %qa-core	QAHOSTS=(qa)	ALL
 %gobby		gombert=(gobby)	ALL
 
 # the dak user gets to run stuff as dak-unpriv (for things like lintian checks)
 dak		ALL=(dak-unpriv)	NOPASSWD: ALL
+%ftptrainee	FTPHOSTS=(dak-unpriv)	NOPASSWD: /usr/bin/lintian
 
 # 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
@@ -127,6 +129,7 @@ Defaults:buildd env_reset,env_keep+="APT_CONFIG DEBIAN_FRONTEND"
 buildd		ALL=(ALL)		NOPASSWD: ALL
 
 %planet		senfl=(staticsync)	NOPASSWD: /usr/local/bin/static-update-component planet.debian.org
+%debbits	master=(staticsync)	NOPASSWD: /usr/local/bin/static-update-component bits.debian.org
 
 # The piuparts slave needs to handle chroots
 piupartss	piatti=(ALL)		NOPASSWD: ALL