I don't think that did what I meant

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

diff --git a/modules/sudo/files/common/sudoers b/modules/sudo/files/common/sudoers
index 2141c19..6ac1fec 100644 (file)
--- 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
@@ -108,22 +111,22 @@ piupartss piatti=(ALL)            NOPASSWD: ALL
 # trigger of mirror run for packages
 pkg_user       powell=(archvsync)      NOPASSWD: /home/archvsync/bin/pushpdo
 # on draghi, the domains git thing will run bind9 reload afterwards
-%adm           draghi=(root)           NOPASSWD: /etc/init.d/bind9 reload
-%adm           draghi=(geodnssync)     NOPASSWD: /usr/bin/make -C /srv/db.debian.org/dns
+%dnsadm                draghi=(root)           NOPASSWD: /etc/init.d/bind9 reload
+%dnsadm                draghi=(geodnssync)     NOPASSWD: /usr/bin/make -C /srv/dns.debian.org/geo
 # remote power to babylon5 in the same rack:
 joerg          unger=(ALL)             /usr/bin/sispmctl -t [12], /usr/bin/sispmctl -g [12]
 # wbadm can update all buildd* users' keys on buildd.d.o
 %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] -- *