X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fsudo%2Ffiles%2Fcommon%2Fsudoers;h=89c44f62c22f13b39c55c200da7bd4f7a5a91b8c;hb=f256a66ce3a6f63e4bac8a602391d0dc77de2e6d;hp=9ff6f97fc40c7bc7efcdc93289be4e5b2614394a;hpb=556c56455d019797bfa7749c1a358280c33957a1;p=mirror%2Fdsa-puppet.git

diff --git a/modules/sudo/files/common/sudoers b/modules/sudo/files/common/sudoers
index 9ff6f97fc..89c44f62c 100644
--- 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