X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fsudo%2Ffiles%2Fsudoers;h=258f64be84e3bbe44d8bfaf6d718473657536690;hb=93bbb3585dc5f0ec8a28d616001d19065f28a41f;hp=e387a1a680c5db74b34b75fde273af4fc02d6b0b;hpb=792a021397b52f3c39f2ced18c6ce08c12723af0;p=mirror%2Fdsa-puppet.git

diff --git a/modules/sudo/files/sudoers b/modules/sudo/files/sudoers
index e387a1a68..258f64be8 100644
--- a/modules/sudo/files/sudoers
+++ b/modules/sudo/files/sudoers
@@ -33,13 +33,12 @@ Host_Alias	FTPHOSTS	= fasolo
 Host_Alias	ZIVITHOSTS	= zelenka, zandonai
 Host_Alias	AACRAIDHOSTS	= pettersson
 Host_Alias	MEGARAIDHOSTS	= sibelius
-Host_Alias	DELLHOSTS	= schumann, wieck, manda-node03, manda-node04, schmelzer, smit
+Host_Alias	DELLHOSTS	= schumann, wieck, manda-node03, manda-node04, schmelzer, smit, new-klecker
 Host_Alias	LISTHOSTS	= bendel
 Host_Alias	BUILDD_MASTER	= wuiet
 Host_Alias	PORTERBOXES	= abel, amdahl, barriere, eller, harris, minkus, plummer, zelenka
 Host_Alias	PIUPARTS_SLAVE_HOSTS	= piu-slave-bm-a, piu-slave-ubc-01
 Host_Alias	MQ_HOSTS	= rainier, rapoport
-Host_Alias	JENKINSHOSTS	= jerea
 
 # Cmnd alias specification
 
@@ -151,7 +150,6 @@ git		godard=(salsa-webhook)	NOPASSWD: ALL
 git		godard=(salsa-pages)	NOPASSWD: ALL
 %keyring	ALL=(keyring)	ALL
 %keyring	kaufmann=(root)		NOPASSWD: /usr/sbin/service bind9 reload
-%jenkins-adm	ALL=(jenkins-adm)	ALL
 %lintian	ALL=(lintian)	ALL
 %listweb	ALL=(listweb)	ALL
 %list		LISTHOSTS=(list)	ALL
@@ -262,6 +260,8 @@ letsencrypt	denis=(dnsadm)			NOPASSWD: /srv/dns.debian.org/bin/update
 # wbadm can update all buildd* users' keys on buildd.d.o
 %wbadm		BUILDD_MASTER=(wb-buildd)	ALL
 %wbadm		BUILDD_MASTER=(root)		/usr/local/bin/update-buildd-sshkeys
+# wbadm can impersonate the wbadm-web user
+%wbadm		BUILDD_MASTER=(wbadm-web)	ALL
 # mirror push
 dak		FTPHOSTS,SECHOSTS=(archvsync)	NOPASSWD:/home/archvsync/runmirrors, /home/archvsync/bin/runmirrors
 # archvsync triggers snapshot
@@ -298,9 +298,6 @@ nagiosadm	tchaikovsky=(root)		NOPASSWD: /usr/sbin/service icinga reload
 # voip stuff
 %debvoip	VOIPHOSTS=(root)	/usr/sbin/service resiprocate-turn-server restart, /usr/sbin/service repro restart
 %debvoip	VOIPHOSTS=(root)	/usr/sbin/service prosody restart, /usr/sbin/service prosody reload, /usr/sbin/service prosody stop, /usr/sbin/service prosody start
-# jenkins
-%jenkins-adm	JENKINSHOSTS=(jenkins)	ALL
-%jenkins-adm	JENKINSHOSTS=(root)	/usr/sbin/service jenkins restart, /usr/sbin/service jenkins reload, /usr/sbin/service jenkins stop, /usr/sbin/service jenkins start
 # snapshot can reload apache to get the wsgi reloaded
 snapshot	lw07,sallinen=(root)	NOPASSWD: /usr/sbin/service apache2 reload
 
@@ -310,5 +307,4 @@ snapshot	lw07,sallinen=(root)	NOPASSWD: /usr/sbin/service apache2 reload
 # ports stuff
 mini-dak	porta=(archvsync)	NOPASSWD: /home/archvsync/signal_ports
 
-# temporary, for debugging
-thijs		klecker=(root)		/usr/sbin/tcpdump
+#includedir /etc/sudoers.d