X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=modules%2Fsudo%2Ffiles%2Fsudoers;h=09a1b3922c1825a37d349e1dc53b5e8bb8fc3555;hb=a6188b6d42c0ca668acac93be35f215c1d762542;hp=a41b92a1e111c7fe532cc2052387fd618bfe7dad;hpb=7115759295ea10a57323206e27bc9fb09baf20bd;p=dsa-puppet.git

diff --git a/modules/sudo/files/sudoers b/modules/sudo/files/sudoers
index a41b92a1..09a1b392 100644
--- a/modules/sudo/files/sudoers
+++ b/modules/sudo/files/sudoers
@@ -31,6 +31,7 @@ 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
 
@@ -82,6 +83,7 @@ nagios		beethoven,backuphost=(debbackup)	NOPASSWD: /usr/lib/nagios/plugins/dsa-c
 %debadmin	ALL=(dak)	ALL
 %debbugs	ALL=(debbugs)	ALL
 %debbugs	ALL=(debbugs-mirror)	ALL
+%debdelta	ALL=(debdelta)	ALL
 %debian-cd	ALL=(debian-cd)	ALL
 %debian-i18n	ALL=(debian-i18n)	ALL
 %debian-release	ALL=(release)	ALL
@@ -129,7 +131,7 @@ dak		ALL=(dak-unpriv)	NOPASSWD: ALL
 Defaults:buildd env_reset,env_keep+="APT_CONFIG DEBIAN_FRONTEND"
 buildd		ALL=(ALL)		NOPASSWD: ALL
 
-%backports	franck,coccia,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		philp,senfl=(staticsync)	NOPASSWD: /usr/local/bin/static-update-component planet.debian.org
@@ -143,11 +145,10 @@ piupartss	PIUPARTS_SLAVE_HOSTS=(ALL)		NOPASSWD: ALL
 %dnsadm		draghi,orff=(root)		NOPASSWD: /etc/init.d/bind9 reload
 %dnsadm		draghi,orff=(geodnssync)	NOPASSWD: /usr/bin/make -C /srv/dns.debian.org/geo
 %adm		draghi=(puppet)			NOPASSWD: /usr/bin/make -s -C /srv/db.debian.org/var/gitnagios/dsa-nagios/config install
-# 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