X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fsudo%2Ffiles%2Fcommon%2Fsudoers;h=260d2c8fbbc27ca7f5e3654371295e21302886ac;hb=1e2215e901a25f879a2e6f23e3d5035fd0cf3423;hp=b7c6232657e1345ab70c1527cd7178d671a3d575;hpb=20457aad497b4f68cb8261e242a5674edd58a97f;p=mirror%2Fdsa-puppet.git

diff --git a/modules/sudo/files/common/sudoers b/modules/sudo/files/common/sudoers
index b7c623265..260d2c8fb 100644
--- a/modules/sudo/files/common/sudoers
+++ b/modules/sudo/files/common/sudoers
@@ -22,15 +22,13 @@ Defaults	passprompt="[sudo] password for %u on %h: "
 
 # Host alias specification
 Host_Alias	QAHOSTS		= master, merkel, quantz
-Host_Alias	WEBHOSTS	= klecker, wolkenstein
-Host_Alias	SECHOSTS	= klecker, chopin
-Host_Alias	FTPHOSTS	= franck, ries
+Host_Alias	WEBHOSTS	= wolkenstein
+Host_Alias	SECHOSTS	= chopin
+Host_Alias	FTPHOSTS	= franck, morricone
 Host_Alias	ZIVITHOSTS	= zelenka, zandonai
-Host_Alias	AACRAIDHOSTS	= bellini, cimarosa, morricone, paganini, respighi, vivaldi, beethoven, pettersson
+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
-# User alias specification
-User_Alias	QACORE		= aba, djpig, geissert, hertzog, jeroen, joerg, lucas, luk, myon, tbm, weasel, zack
 
 # Cmnd alias specification
 
@@ -40,7 +38,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, /usr/sbin/upgrade-porter-chroots
+%adm		ALL=(ALL)	NOPASSWD: /usr/bin/apt-get update, /usr/bin/apt-get upgrade, /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
 
 admin		agnesi=(ALL)	ALL
 %zivit-admins	ZIVITHOSTS=(ALL)	NOPASSWD: ALL
@@ -78,6 +76,7 @@ nagios		beethoven=(debbackup)	NOPASSWD: /usr/lib/nagios/plugins/dsa-check-backup
 %debian-release	ALL=(release)	ALL
 %debvoip	cilea=(freeswitch)	ALL
 %debwww		ALL=(debwww)	ALL
+%btslink	ALL=(btslink)	ALL
 %forums		ALL=(forums)	ALL
 %keyring	ALL=(keyring)	ALL
 %lintian	ALL=(lintian)	ALL
@@ -99,7 +98,7 @@ nagios		beethoven=(debbackup)	NOPASSWD: /usr/lib/nagios/plugins/dsa-check-backup
 %volatile	ALL=(volatile)	ALL
 %wbadm		ALL=(wbadm)	ALL
 %wikiadm	ALL=(wiki)	ALL
-QACORE		QAHOSTS=(qa)	ALL
+%qa-core	QAHOSTS=(qa)	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
@@ -119,10 +118,10 @@ pkg_user	powell=(archvsync)	NOPASSWD: /home/archvsync/bin/pushpdo
 # 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		cimarosa,grieg=(root)		/usr/local/bin/update-buildd-sshkeys
-wbadm		cimarosa,grieg=(postgres)	NOPASSWD: /usr/bin/pg_dumpall --cluster 8.4/wanna-build
+%wbadm		grieg=(root)		/usr/local/bin/update-buildd-sshkeys
+wbadm		grieg=(postgres)	NOPASSWD: /usr/bin/pg_dumpall --cluster 8.4/wanna-build
 # mirror push
-dak		FTPHOSTS,morricone=(archvsync)	NOPASSWD:/home/archvsync/runmirrors
+dak		FTPHOSTS,SECHOSTS=(archvsync)	NOPASSWD:/home/archvsync/runmirrors
 planet		senfl=(archvsync)	NOPASSWD: /home/archvsync/bin/runplanet ""
 # archvsync triggers snapshot
 archvsync	sibelius,stabile=(snapshot)	NOPASSWD: /srv/snapshot.debian.org/bin/update-trigger
@@ -133,12 +132,13 @@ debbugs-mirror	rietz=(root)		NOPASSWD: /usr/bin/vos release -id srv.mirrors.bugs
 %debian-release	FTPHOSTS=(dak)		/usr/local/bin/dak transitions --import *
 %ftpteam	FTPHOSTS=(dak)		/usr/local/bin/dak transitions --import *
 # security
-%security	SECHOSTS=(dak)		NOPASSWD: /usr/local/bin/dak new-security-install -[AR] -- *
-%sec_public	SECHOSTS=(dak)		NOPASSWD: /usr/local/bin/dak new-security-install -[AR] -- *
+%security	SECHOSTS=(dak)		NOPASSWD: /usr/local/bin/dak new-security-install -[AR]
+%sec_public	SECHOSTS=(dak)		NOPASSWD: /usr/local/bin/dak new-security-install -[AR]
 %sec_public	SECHOSTS=(dak)		NOPASSWD: /home/dak/trigger_mirror
 dak		SECHOSTS=(archvsync)	NOPASSWD: /home/archvsync/signal_security
 # web stuff
 debwww		WEBHOSTS=(archvsync)	NOPASSWD: /home/archvsync/webmirrors/runmirrors
+%press		WEBHOSTS=(debwww)	/org/www.debian.org/update-part News
 # more list stuff
 %list		liszt=(root)		/usr/sbin/postfix reload
 %list		liszt=(root)		/usr/sbin/qshape, /usr/sbin/postsuper