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 9ff6f97..89c44f6 100644 (file)
--- a/modules/sudo/files/common/sudoers
+++ b/modules/sudo/files/common/sudoers
@@ -18,11 +18,13 @@
 ###################################################################
 
 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
 # User alias specification
 User_Alias     QACORE          = aba, djpig, geissert, hertzog, jeroen, joerg, lucas, luk, myon, tbm, weasel, zack
 
@@ -37,7 +39,7 @@ root  ALL=(ALL) ALL
 %adm           ALL=(ALL)       NOPASSWD: /usr/bin/apt-get update, /usr/bin/apt-get dist-upgrade, /usr/bin/apt-get clean, /usr/sbin/samhain -t check -i -p err -s none -l none -m none, /usr/sbin/upgrade-porter-chroots
 
 admin          agnesi=(ALL)    ALL
-%zivit-admins  zelenka=(ALL)   NOPASSWD: ALL
+%zivit-admins  ZIVITHOSTS=(ALL)        NOPASSWD: ALL
 
 # nagios
 nagios         ALL=(ALL)       NOPASSWD: /usr/lib/nagios/plugins/dsa-check-dabackup ""
@@ -53,7 +55,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=(ALL)      NOPASSWD: /usr/local/bin/arcconf GETCONFIG 1 LD, /usr/local/bin/arcconf GETCONFIG 1 AD
+nagios         bellini,cimarosa,morricone,paganini,respighi,vivaldi,beethoven=(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