Merge branch 'master' of git+ssh://zobel@handel.debian.org/srv/puppet.debian.org...

[mirror/dsa-puppet.git] / modules / sudo / files / common / sudoers

diff --git a/modules/sudo/files/common/sudoers b/modules/sudo/files/common/sudoers
index 10e850b..7d8c960 100644 (file)
--- 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
@@ -88,8 +88,8 @@ 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
 # 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