X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=modules%2Fsudo%2Ffiles%2Fcommon%2Fsudoers;h=b05b76a06286d93751b1fc7dbc1d4bacac21ba33;hb=ee981070efe9e01c10d02b6bf93fa7e38a86f90e;hp=0b899cb775e151d929093714418b6b41660ac8e4;hpb=d63e016c788a5ff13e956f5d545baa4d19f3ec18;p=mirror%2Fdsa-puppet.git

diff --git a/modules/sudo/files/common/sudoers b/modules/sudo/files/common/sudoers
index 0b899cb77..b05b76a06 100644
--- a/modules/sudo/files/common/sudoers
+++ b/modules/sudo/files/common/sudoers
@@ -21,7 +21,7 @@ Defaults	env_reset
 Defaults	passprompt="[sudo] password for %u on %h: "
 
 # Host alias specification
-Host_Alias	QAHOSTS		= master, merkel, quantz
+Host_Alias	QAHOSTS		= master, quantz
 Host_Alias	WEBHOSTS	= wolkenstein
 Host_Alias	SECHOSTS	= chopin
 Host_Alias	FTPHOSTS	= franck, morricone
@@ -29,6 +29,7 @@ Host_Alias	ZIVITHOSTS	= zelenka, zandonai
 Host_Alias	AACRAIDHOSTS	= bellini, morricone, paganini, respighi, vivaldi, beethoven, pettersson
 Host_Alias	MEGARAIDHOSTS	= grieg, rautavaara, sibelius
 Host_Alias	MPTRAIDHOSTS	= master, fasch, holter, barber, biber, cilea, vitry, krenek, scelsi, orff, field
+Host_Alias	MEGACTLHOSTS	= lindberg, englund, heininen
 
 # Cmnd alias specification
 
@@ -64,11 +65,12 @@ nagios		puccini=(ALL)	NOPASSWD: /usr/local/bin/tw_cli info c0 u0 status
 nagios		MPTRAIDHOSTS=(ALL)	NOPASSWD: /usr/sbin/mpt-status -s
 nagios		AACRAIDHOSTS=(ALL)	NOPASSWD: /usr/local/bin/arcconf GETCONFIG 1 LD, /usr/local/bin/arcconf GETCONFIG 1 AD
 nagios		MEGARAIDHOSTS=(ALL)	NOPASSWD: /usr/local/bin/megarc -AllAdpInfo -nolog, /usr/local/bin/megarc -dispCfg -a0 -nolog
+nagios		MEGACTLHOSTS=(ALL)	NOPASSWD: /usr/sbin/megactl -Hv
 # other nagios things
 nagios		beethoven=(debbackup)	NOPASSWD: /usr/lib/nagios/plugins/dsa-check-backuppg ""
 
 # groups and their role accounts
-%accounting	ALL=(auditor)	ALL
+%auditor	ALL=(accounting)	ALL
 %backports	ALL=(backports)	ALL
 %buildd		ALL=(buildd)	ALL
 %d-i		ALL=(d-i)	ALL
@@ -107,6 +109,10 @@ nagios		beethoven=(debbackup)	NOPASSWD: /usr/lib/nagios/plugins/dsa-check-backup
 %mujeres	ALL=(women)	ALL
 %wikiadm	ALL=(wiki)	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
 
 # 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