X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fsudo%2Ffiles%2Fcommon%2Fsudoers;h=bd3cd93ed6ae39d9ed0823212cba0ebea3c9023f;hb=7990ed9edd0afcabf7b518d9600ceacf9e6a0896;hp=12ab95acbbcfa0ea1906523bbacfcb9163f87f50;hpb=c4b8b574e1827c9570bccfff1475d062ee97c13a;p=mirror%2Fdsa-puppet.git

diff --git a/modules/sudo/files/common/sudoers b/modules/sudo/files/common/sudoers
index 12ab95acb..bd3cd93ed 100644
--- a/modules/sudo/files/common/sudoers
+++ b/modules/sudo/files/common/sudoers
@@ -24,6 +24,7 @@ Defaults	passprompt="[sudo] password for %u on %h: "
 Host_Alias	QAHOSTS		= master, merkel
 Host_Alias	WEBHOSTS	= klecker, wolkenstein
 Host_Alias	SECHOSTS	= klecker, chopin
+Host_Alias	FTPHOSTS	= ries, franck
 Host_Alias	ZIVITHOSTS	= zelenka, zandonai
 Host_Alias	AACRAIDHOSTS	= bellini, cimarosa, morricone, paganini, respighi, vivaldi, beethoven, pettersson
 Host_Alias	MEGARAIDHOSTS	= grieg, rautavaara, sibelius
@@ -49,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=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=[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
@@ -71,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
@@ -116,14 +120,14 @@ joerg		unger=(ALL)		/usr/bin/sispmctl -t [12], /usr/bin/sispmctl -g [12]
 %wbadm		cimarosa,grieg=(root)		/usr/local/bin/update-buildd-sshkeys
 wbadm		cimarosa,grieg=(postgres)	NOPASSWD: /usr/bin/pg_dumpall --cluster 8.4/wanna-build
 # mirror push
-dak		ries=(archvsync)	NOPASSWD:/home/archvsync/runmirrors
+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
 # dak stuff
-%debian-release	ries=(dak)		/usr/local/bin/dak transitions --import *
-%ftpteam	ries=(dak)		/usr/local/bin/dak transitions --import *
+%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] -- *