X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fsudo%2Ffiles%2Fcommon%2Fsudoers;h=0beba728e8697e42b6502b006c61641d9f406cf1;hb=8ce24ebd26a39dd1ff245ab9f982d8e2bce92743;hp=8dfab608331a33663c1e844e77b98e5d21e33452;hpb=ef7cd9e6c06b7f491dba450a1b7588d0bb5008b0;p=mirror%2Fdsa-puppet.git

diff --git a/modules/sudo/files/common/sudoers b/modules/sudo/files/common/sudoers
index 8dfab6083..0beba728e 100644
--- a/modules/sudo/files/common/sudoers
+++ b/modules/sudo/files/common/sudoers
@@ -50,11 +50,13 @@ nagios		ALL=(ALL)	NOPASSWD: /usr/lib/nagios/plugins/dsa-check-dabackup ""
 # with smartarray controllers
 nagios		ALL=(ALL)	NOPASSWD: /sbin/hpasmcli ""
 nagios		ALL=(ALL)	NOPASSWD: /usr/bin/arrayprobe ""
+nagios		franck=(ALL)	NOPASSWD: /usr/bin/arrayprobe -f /dev/cciss/c1d0
 nagios		ALL=(ALL)	NOPASSWD: /usr/sbin/hpacucli controller all show
-nagios		ALL=(ALL)	NOPASSWD: /usr/sbin/hpacucli controller slot=[02] pd all show
-nagios		ALL=(ALL)	NOPASSWD: /usr/sbin/hpacucli controller slot=[01] pd [0-9]\:[0-9] show
-nagios		ALL=(ALL)	NOPASSWD: /usr/sbin/hpacucli controller slot=[01] pd [0-9]I\:[0-9]\:[0-9] show
-nagios		ALL=(ALL)	NOPASSWD: /usr/sbin/hpacucli controller slot=[02] show status
+nagios		ALL=(ALL)	NOPASSWD: /usr/sbin/hpacucli controller slot=[012] pd all show
+nagios		ALL=(ALL)	NOPASSWD: /usr/sbin/hpacucli controller slot=[012] pd [0-9]\:[0-9] show
+nagios		ALL=(ALL)	NOPASSWD: /usr/sbin/hpacucli controller slot=[012] pd [0-9][EIC]\:[0-9]\:[0-9] show
+nagios		ALL=(ALL)	NOPASSWD: /usr/sbin/hpacucli controller slot=[012] pd [0-9][EIC]\:[0-9]\:[0-9][0-9] show
+nagios		ALL=(ALL)	NOPASSWD: /usr/sbin/hpacucli controller slot=[012] show status
 # other raid controllers
 nagios		powell=(ALL)	NOPASSWD: /usr/local/sbin/areca-cli vsf info
 nagios		puccini=(ALL)	NOPASSWD: /usr/local/bin/tw_cli info c0 u0 status
@@ -72,6 +74,7 @@ nagios		beethoven=(debbackup)	NOPASSWD: /usr/lib/nagios/plugins/dsa-check-backup
 %debbugs	ALL=(debbugs)	ALL
 %debian-cd	ALL=(debian-cd)	ALL
 %debian-release	ALL=(release)	ALL
+%debvoip	cilea=(freeswitch)	ALL
 %debwww		ALL=(debwww)	ALL
 %forums		ALL=(forums)	ALL
 %keyring	ALL=(keyring)	ALL
@@ -120,15 +123,15 @@ wbadm		cimarosa,grieg=(postgres)	NOPASSWD: /usr/bin/pg_dumpall --cluster 8.4/wan
 dak		FTPHOSTS=(archvsync)	NOPASSWD:/home/archvsync/runmirrors
 planet		senfl=(archvsync)	NOPASSWD: /home/archvsync/bin/runplanet ""
 # archvsync triggers snapshot
-archvsync	stabile=(snapshot)	NOPASSWD: /srv/snapshot.debian.org/bin/update-trigger
-archvsync	sibelius=(snapshot)	NOPASSWD: /srv/2ndsnapshot/bin/update-trigger
+archvsync	sibelius,stabile=(snapshot)	NOPASSWD: /srv/snapshot.debian.org/bin/update-trigger
+archvsync	sibelius,stabile=(snapshot)	NOPASSWD: /srv/2ndsnapshot/bin/update-trigger
 # dak stuff
 %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] -- *
-%sec_data	SECHOSTS=(archvsync)	NOPASSWD: /home/archvsync/security/signal ""
+%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
@@ -141,10 +144,13 @@ debwww		WEBHOSTS=(archvsync)	NOPASSWD: /home/archvsync/webmirrors/runmirrors
 # 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
+# fossology
+%fossy		vivaldi=(root)		/etc/init.d/fossology
+%fossy		vivaldi=(fossy)		ALL
 
 # Porter work
 %porter-alpha	albeniz=(root)		NOPASSWD: /usr/sbin/upgrade-porter-chroots, /usr/bin/apt-in-chroot
-%porter-armel	agricola=(root)		NOPASSWD: /usr/sbin/upgrade-porter-chroots, /usr/bin/apt-in-chroot
+%porter-armel	abel,agricola=(root)	NOPASSWD: /usr/sbin/upgrade-porter-chroots, /usr/bin/apt-in-chroot
 %porter-amd64	pergolesi=(root)	NOPASSWD: /usr/sbin/upgrade-porter-chroots, /usr/bin/apt-in-chroot
 %porter-hppa	paer=(root)		NOPASSWD: /usr/sbin/upgrade-porter-chroots, /usr/bin/apt-in-chroot
 %porter-ia64	merulo=(root)		NOPASSWD: /usr/sbin/upgrade-porter-chroots, /usr/bin/apt-in-chroot