Merge branch 'master' of git+ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa...

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

diff --git a/modules/sudo/files/common/sudoers b/modules/sudo/files/common/sudoers
index b1e8496a1408d638aa15a9ee6aabb07f92855602..559ec9b467a1defef14babb3fb4978df09c1b8c6 100644 (file)
--- a/modules/sudo/files/common/sudoers
+++ b/modules/sudo/files/common/sudoers
@@ -24,7 +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     FTPHOSTS        = franck
 Host_Alias     ZIVITHOSTS      = zelenka, zandonai
 Host_Alias     AACRAIDHOSTS    = bellini, cimarosa, morricone, paganini, respighi, vivaldi, beethoven, pettersson
 Host_Alias     MEGARAIDHOSTS   = grieg, rautavaara, sibelius
@@ -52,11 +52,13 @@ 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=[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
+nagios         ALL=(ALL)       NOPASSWD: /usr/sbin/hpacucli controller slot=[0129] pd all show
+nagios         ALL=(ALL)       NOPASSWD: /usr/sbin/hpacucli controller slot=[0129] pd [0-9]\:[0-9] show
+nagios         ALL=(ALL)       NOPASSWD: /usr/sbin/hpacucli controller slot=[0129] pd [0-9][EIC]\:[0-9]\:[0-9] show
+nagios         ALL=(ALL)       NOPASSWD: /usr/sbin/hpacucli controller slot=[0129] pd [0-9][EIC]\:[0-9]\:[0-9][0-9] show
+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
+
 # 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
@@ -123,8 +125,8 @@ 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 *