X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=modules%2Fsudo%2Ffiles%2Fsudoers;h=42f27907bbc74f5a0c11ef333c1088887129b3df;hb=a7daaf29edda45d0e5c9b3086b50b298b3722e92;hp=4b40ca83e0d49a055e52bb80cae9407b15971757;hpb=24365519da1aa03469ca22e92ec5e8575a794f9e;p=dsa-puppet.git

diff --git a/modules/sudo/files/sudoers b/modules/sudo/files/sudoers
index 4b40ca83..42f27907 100644
--- a/modules/sudo/files/sudoers
+++ b/modules/sudo/files/sudoers
@@ -24,13 +24,14 @@ Defaults        secure_path="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/
 # Host alias specification
 Host_Alias	WEBHOSTS	= wolkenstein
 Host_Alias	SECHOSTS	= chopin
-Host_Alias	FTPHOSTS	= franck, morricone
+Host_Alias	FTPHOSTS	= franck
 Host_Alias	ZIVITHOSTS	= zelenka, zandonai
-Host_Alias	AACRAIDHOSTS	= bellini, morricone, paganini, respighi, beethoven, pettersson
+Host_Alias	AACRAIDHOSTS	= paganini, respighi, beethoven, pettersson
 Host_Alias	MEGARAIDHOSTS	= grieg, rautavaara, sibelius
 Host_Alias	MPTRAIDHOSTS	= barber, biber, cilea, vitry, orff
 Host_Alias	MEGACTLHOSTS	= nielsen
 Host_Alias	LISTHOSTS	= bendel
+Host_Alias	BUILDD_MASTER	= grieg, wuiet
 Host_Alias	PORTERBOXES	= abel, agricola, barriere, eder, falla, fischer, gabrielli, harris, merulo, partch, smetana, zelenka
 Host_Alias	PIUPARTS_SLAVE_HOSTS	= piu-slave-bm-a
 
@@ -69,12 +70,13 @@ nagios		AACRAIDHOSTS=(ALL)	NOPASSWD: /usr/local/bin/arcconf GETCONFIG 1 LD, /usr
 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 ""
+nagios		beethoven,backuphost=(debbackup)	NOPASSWD: /usr/lib/nagios/plugins/dsa-check-backuppg ""
 
 # groups and their role accounts
 %auditor	ALL=(accounting)	ALL
 %backports	ALL=(backports)	ALL
 %buildd		ALL=(buildd)	ALL
+%codesearch	ALL=(codesearch)	ALL
 %d-i		ALL=(d-i)	ALL
 %dde		ALL=(dde)	ALL
 %ddtp		ALL=(ddtp)	ALL
@@ -87,6 +89,7 @@ nagios		beethoven=(debbackup)	NOPASSWD: /usr/lib/nagios/plugins/dsa-check-backup
 %debtags	ALL=(debtags)	ALL
 %debvoip	cilea=(freeswitch)	ALL
 %debwww		ALL=(debwww)	ALL
+%dedup		ALL=(dedup)	ALL
 %btslink	ALL=(btslink)	ALL
 %emdebian	ALL=(emdebian)	ALL
 %forums		ALL=(forums)	ALL
@@ -127,10 +130,10 @@ dak		ALL=(dak-unpriv)	NOPASSWD: ALL
 Defaults:buildd env_reset,env_keep+="APT_CONFIG DEBIAN_FRONTEND"
 buildd		ALL=(ALL)		NOPASSWD: ALL
 
-%backports	franck,ries=(staticsync)	NOPASSWD: /usr/local/bin/static-update-component backports.debian.org
+%backports	franck,coccia=(staticsync)	NOPASSWD: /usr/local/bin/static-update-component backports.debian.org
 dak		franck=(staticsync)		NOPASSWD: /usr/local/bin/static-update-component ftp-master.metadata.debian.org
 %debbits	master=(staticsync)		NOPASSWD: /usr/local/bin/static-update-component bits.debian.org
-planet		senfl=(staticsync)		NOPASSWD: /usr/local/bin/static-update-component planet.debian.org
+planet		philp,senfl=(staticsync)	NOPASSWD: /usr/local/bin/static-update-component planet.debian.org
 debwww		wolkenstein=(staticsync)	NOPASSWD: /usr/local/bin/static-update-component www.debian.org
 
 # The piuparts slave needs to handle chroots
@@ -144,10 +147,12 @@ piupartss	PIUPARTS_SLAVE_HOSTS=(ALL)		NOPASSWD: ALL
 # remote power to babylon5 in the same rack:
 joerg		unger=(ALL)		/usr/bin/sispmctl -t [12], /usr/bin/sispmctl -g [12]
 # wbadm can update all buildd* users' keys on buildd.d.o
-%wbadm		grieg=(root)		/usr/local/bin/update-buildd-sshkeys
-wbadm		grieg=(postgres)	NOPASSWD: /usr/bin/pg_dumpall --cluster 8.4/wanna-build
+%wbadm		BUILDD_MASTER=(wb-buildd)	ALL
+%wbadm		BUILDD_MASTER=(root)		/usr/local/bin/update-buildd-sshkeys
+#wbadm		BUILDD_MASTER=(postgres)	NOPASSWD: /usr/bin/pg_dumpall --cluster 8.4/wanna-build
 # mirror push
 dak		FTPHOSTS,SECHOSTS=(archvsync)	NOPASSWD:/home/archvsync/runmirrors
+dak		franck=(backports)	NOPASSWD: /home/backports/bin/update-archive
 planet		senfl=(archvsync)	NOPASSWD: /home/archvsync/bin/runplanet ""
 # archvsync triggers snapshot
 archvsync	sibelius,stabile=(snapshot)	NOPASSWD: /srv/snapshot.debian.org/bin/update-trigger