X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fsudo%2Ffiles%2Fcommon%2Fsudoers;h=5debc1e34207b5ab0a4c4c7102a7f3a85ff42f9e;hb=f3c9e23add4260d8100ab68870fa991b82da40cd;hp=10e850bf5bf88cab8d012cbd98522c1c7421f793;hpb=0dcd08c0bf53f58ae31b28eebe6d6de63612f4b0;p=mirror%2Fdsa-puppet.git

diff --git a/modules/sudo/files/common/sudoers b/modules/sudo/files/common/sudoers
index 10e850bf5..5debc1e34 100644
--- a/modules/sudo/files/common/sudoers
+++ b/modules/sudo/files/common/sudoers
@@ -8,7 +8,7 @@
 ###################################################################
 ###################################################################
 ##
-## PLEASE EDIT THIS FILE WITH THE visud COMMAND TO ENSURE IT
+## PLEASE EDIT THIS FILE WITH THE visudo COMMAND TO ENSURE IT
 ## IS SYNTACTICALLY VALID.
 ##
 ##  /usr/sbin/visudo -f sudoers
@@ -42,10 +42,10 @@ nagios		ALL=(ALL)	NOPASSWD: /usr/lib/nagios/plugins/dsa-check-dabackup ""
 # with smartarray controllers
 nagios		ALL=(ALL)	NOPASSWD: /usr/bin/arrayprobe ""
 nagios		ALL=(ALL)	NOPASSWD: /usr/sbin/hpacucli controller all show
-nagios		ALL=(ALL)	NOPASSWD: /usr/sbin/hpacucli controller slot=0 pd all show
+nagios		ALL=(ALL)	NOPASSWD: /usr/sbin/hpacucli controller slot=[02] pd all show
 nagios		ALL=(ALL)	NOPASSWD: /usr/sbin/hpacucli controller slot=0 pd [0-9]\:[0-9] show
 nagios		ALL=(ALL)	NOPASSWD: /usr/sbin/hpacucli controller slot=0 pd [0-9]I\:[0-9]\:[0-9] show
-nagios		ALL=(ALL)	NOPASSWD: /usr/sbin/hpacucli controller slot=0 show status
+nagios		ALL=(ALL)	NOPASSWD: /usr/sbin/hpacucli controller slot=[02] show status
 # other raid controllers
 nagios		master=(ALL)	NOPASSWD: /usr/sbin/mpt-status -s
 nagios		powell=(ALL)	NOPASSWD: /usr/local/sbin/areca-cli vsf info
@@ -62,6 +62,8 @@ nagios		puccini=(ALL)	NOPASSWD: /usr/local/bin/tw_cli info c0 u0 status
 %forums		ALL=(forums)	ALL
 %keyring	ALL=(keyring)	ALL
 %lintian	ALL=(lintian)	ALL
+%listweb	ALL=(listweb)	ALL
+%list		liszt=(list)	ALL
 %mirroradm	ALL=(archvsync)	ALL
 %nm		ALL=(nm)	ALL
 %piuparts	ALL=(piupartsm)	ALL
@@ -88,8 +90,9 @@ buildd		ALL=(ALL)		NOPASSWD: ALL
 piupartss	piatti=(ALL)		NOPASSWD: ALL
 # trigger of mirror run for packages
 pkg_user	powell=(archvsync)	NOPASSWD: /home/archvsync/bin/pushpdo
-# on samosa, the domains git thing will run bind9 reload afterwards
-%adm		ALL=(root)		NOPASSWD: /etc/init.d/bind9 reload
+# on draghi, the domains git thing will run bind9 reload afterwards
+%adm		draghi=(root)		NOPASSWD: /etc/init.d/bind9 reload
+%adm		draghi=(geodnssync)	NOPASSWD: /usr/bin/make -C /srv/db.debian.org/dns
 # remote power to babylon5 in the same rack:
 joerg		unger=(ALL)		/usr/bin/sispmctl -t 1, /usr/bin/sispmctl -g 1
 # wbadm can update all buildd* users' keys on buildd.d.o
@@ -106,3 +109,12 @@ dak		ries=(archvsync)	NOPASSWD:/home/archvsync/runmirrors
 dak		klecker=(archvsync)	NOPASSWD: /home/archvsync/signal_security
 # web stuff
 debwww		klecker=(archvsync)	NOPASSWD: /home/archvsync/webmirrors/runmirrors
+# more list stuff
+%list		liszt=(root)		/usr/sbin/postfix reload
+%list		liszt=(root)		/usr/sbin/qshape, /usr/sbin/postsuper
+%list		liszt=(root)		/etc/init.d/spamassassin, /etc/init.d/amavis
+%list		liszt=(amavis)		NOPASSWD: /usr/bin/sa-learn
+%list		liszt=(amavis)		ALL
+# geodns may reload bind
+geodnssync	geo1,geo2,geo3=(root)	NOPASSWD: /etc/init.d/bind9 reload
+geodnssync	geo1,geo2,geo3=(root)	NOPASSWD: /usr/sbin/rndc reconfig