X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fsudo%2Ffiles%2Fsudoers;h=6c9a72e8d35ff7a4c469ea48ca344fb253876979;hb=56bb5cfe955fb6ab5fb79b8a64bdec4d5a44081e;hp=d829acd514fc9eb9ab17c1db2f1a5ecd95bd0131;hpb=117b10382e9b96bcb7d26362dec2003d56d1b104;p=mirror%2Fdsa-puppet.git

diff --git a/modules/sudo/files/sudoers b/modules/sudo/files/sudoers
index d829acd51..6c9a72e8d 100644
--- a/modules/sudo/files/sudoers
+++ b/modules/sudo/files/sudoers
@@ -39,7 +39,6 @@ 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
 
@@ -92,9 +91,6 @@ nagios		MEGARAIDHOSTS=(ALL)	NOPASSWD: /usr/local/bin/megarc -AllAdpInfo -nolog,
 nagios		DELLHOSTS=(ALL)		NOPASSWD: /usr/lib/nagios/plugins/dsa-check-openmanage ""
 nagios		DELLHOSTS=(ALL)		NOPASSWD: /usr/lib/nagios/plugins/dsa-check-openmanage -b bp=0
 nagios		DELLHOSTS=(ALL)		NOPASSWD: /usr/lib/nagios/plugins/dsa-check-openmanage -b bp=0 -b bat_charge=0\:0
-# other nagios things
-nagios		backuphost=(debbackup)	NOPASSWD: /usr/lib/nagios/plugins/dsa-check-backuppg ""
-nagios		storace=(debbackup)	NOPASSWD: /usr/lib/nagios/plugins/dsa-check-backuppg ""
 
 # groups and their role accounts
 %alioth-archive	ALL=(alioth-archive)	ALL
@@ -151,7 +147,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
@@ -161,6 +156,9 @@ git		godard=(salsa-pages)	NOPASSWD: ALL
 %mirroradm	ALL=(archvsync)	ALL
 %mirroradm	melartin=(mirroradm)	ALL
 %nm		ALL=(nm)	ALL
+%nm		ALL=(nm-web)	ALL
+%contributors	ALL=(contributors)	ALL
+%contributors	ALL=(contributors-web)	ALL
 %patch-tracker	ALL=(patch-tracker)	ALL
 %pet-devel	ALL=(pet-devel)	ALL
 %piuparts	ALL=(piupartsm)	ALL
@@ -243,7 +241,6 @@ pabs		dillon=(staticsync)		NOPASSWD: /usr/local/bin/static-update-component time
 %debconfstatic	dillon=(staticsync)		NOPASSWD: /usr/local/bin/static-update-component debconf16.debconf.org
 %debconfstatic	dillon=(staticsync)		NOPASSWD: /usr/local/bin/static-update-component debconf17.debconf.org
 %debconfstatic	dillon=(staticsync)		NOPASSWD: /usr/local/bin/static-update-component debconf18.debconf.org
-%debconfstatic	dillon=(staticsync)		NOPASSWD: /usr/local/bin/static-update-component debconf19.debconf.org
 %debconfstatic	dillon=(staticsync)		NOPASSWD: /usr/local/bin/static-update-component es.debconf.org
 %debconfstatic	dillon=(staticsync)		NOPASSWD: /usr/local/bin/static-update-component fr.debconf.org
 %debconfstatic	dillon=(staticsync)		NOPASSWD: /usr/local/bin/static-update-component miniconf10.debconf.org
@@ -300,9 +297,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
 
@@ -312,5 +306,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