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

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

diff --git a/modules/sudo/files/common/sudoers b/modules/sudo/files/common/sudoers
index 01b4004..698ac30 100644 (file)
--- a/modules/sudo/files/common/sudoers
+++ b/modules/sudo/files/common/sudoers
@@ -18,12 +18,14 @@
 ###################################################################
 
 Defaults       env_reset
+Defaults       passprompt="[sudo] password for %u on %h: "
 
 # Host alias specification
 Host_Alias     QAHOSTS         = master, merkel
 Host_Alias     WEBHOSTS        = klecker, wolkenstein
 Host_Alias     SECHOSTS        = klecker, chopin
 Host_Alias     ZIVITHOSTS      = zelenka, zandonai
+Host_Alias     AACRAIDHOSTS    = bellini, cimarosa, morricone, paganini, respighi, vivaldi, beethoven, pettersson
 # User alias specification
 User_Alias     QACORE          = aba, djpig, geissert, hertzog, jeroen, joerg, lucas, luk, myon, tbm, weasel, zack
 
@@ -54,7 +56,7 @@ nagios                ALL=(ALL)       NOPASSWD: /usr/sbin/hpacucli controller slot=[02] show status
 nagios         master=(ALL)    NOPASSWD: /usr/sbin/mpt-status -s
 nagios         powell=(ALL)    NOPASSWD: /usr/local/sbin/areca-cli vsf info
 nagios         puccini=(ALL)   NOPASSWD: /usr/local/bin/tw_cli info c0 u0 status
-nagios         bellini,cimarosa,morricone,paganini,respighi,vivaldi,beethoven=(ALL)    NOPASSWD: /usr/local/bin/arcconf GETCONFIG 1 LD, /usr/local/bin/arcconf GETCONFIG 1 AD
+nagios         AACRAIDHOSTS=(ALL)      NOPASSWD: /usr/local/bin/arcconf GETCONFIG 1 LD, /usr/local/bin/arcconf GETCONFIG 1 AD
 
 # groups and their role accounts
 %buildd                ALL=(buildd)    ALL
@@ -112,6 +114,7 @@ dak         ries=(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 *