X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=modules%2Fsudo%2Ffiles%2Fsudoers;h=f899e3fb98ae33cf8e52615e6678b5ca11c3ae49;hb=808f1d318c43aaec1f3fcbfeab9571f93142e81a;hp=c265b02054f44b8ce972114d151926e805258635;hpb=ef5f7c1a1b7bd4b514daf3a7e107b7e5e9915777;p=mirror%2Fdsa-puppet.git

diff --git a/modules/sudo/files/sudoers b/modules/sudo/files/sudoers
index c265b0205..f899e3fb9 100644
--- a/modules/sudo/files/sudoers
+++ b/modules/sudo/files/sudoers
@@ -48,7 +48,7 @@ root	ALL=(ALL) ALL
 # nagios
 nagios		ALL=(ALL)	NOPASSWD: /etc/init.d/ekeyd-egd-linux restart
 nagios		ALL=(ALL)	NOPASSWD: /usr/lib/nagios/plugins/dsa-check-dabackup ""
-nagios		dinis=(ALL)	NOPASSWD: /usr/lib/nagios/plugins/dsa-check-bacula
+nagios		dinis=(ALL)	NOPASSWD: /usr/lib/nagios/plugins/dsa-check-bacula, /usr/lib/nagios/plugins/dsa-check-bacula-lastbackup-wrap
 nagios		ALL=(ALL)	NOPASSWD: /usr/lib/nagios/plugins/dsa-check-filesystems ""
 # with smartarray controllers
 nagios		ALL=(ALL)	NOPASSWD: /sbin/hpasmcli ""
@@ -62,14 +62,6 @@ nagios		ALL=(ALL)	NOPASSWD: /usr/sbin/hpacucli controller slot=[0129] pd [0-9][E
 nagios		ALL=(ALL)	NOPASSWD: /usr/sbin/hpacucli controller slot=[0129] show status
 nagios		franck=(ALL)	NOPASSWD: /usr/sbin/hpacucli controller slot=1 enclosure 1E\:1 show detail
 
-nagios		ALL=(ALL)	NOPASSWD: /usr/bin/setarch x86_64 --uname-2.6 /usr/sbin/hpacucli controller all show
-nagios		ALL=(ALL)	NOPASSWD: /usr/bin/setarch x86_64 --uname-2.6 /usr/sbin/hpacucli controller slot=[0129] pd all show
-nagios		ALL=(ALL)	NOPASSWD: /usr/bin/setarch x86_64 --uname-2.6 /usr/sbin/hpacucli controller slot=[0129] pd [0-9]\:[0-9] show
-nagios		ALL=(ALL)	NOPASSWD: /usr/bin/setarch x86_64 --uname-2.6 /usr/sbin/hpacucli controller slot=[0129] pd [0-9][EIC]\:[0-9]\:[0-9] show
-nagios		ALL=(ALL)	NOPASSWD: /usr/bin/setarch x86_64 --uname-2.6 /usr/sbin/hpacucli controller slot=[0129] pd [0-9][EIC]\:[0-9]\:[0-9][0-9] show
-nagios		ALL=(ALL)	NOPASSWD: /usr/bin/setarch x86_64 --uname-2.6 /usr/sbin/hpacucli controller slot=[0129] show status
-nagios		franck=(ALL)	NOPASSWD: /usr/bin/setarch x86_64 --uname-2.6 /usr/sbin/hpacucli controller slot=1 enclosure 1E\:1 show detail
-
 # 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
@@ -137,6 +129,7 @@ Defaults:buildd env_reset,env_keep+="APT_CONFIG DEBIAN_FRONTEND"
 buildd		ALL=(ALL)		NOPASSWD: ALL
 
 %planet		senfl=(staticsync)	NOPASSWD: /usr/local/bin/static-update-component planet.debian.org
+%debbits	master=(staticsync)	NOPASSWD: /usr/local/bin/static-update-component bits.debian.org
 
 # The piuparts slave needs to handle chroots
 piupartss	piatti=(ALL)		NOPASSWD: ALL