From: Martin Zobel-Helas Date: Sun, 17 Feb 2013 20:19:09 +0000 (+0100) Subject: Merge branch 'master' of git+ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa... X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=c2d7c2c6141a812e63429f94827d8c99b3e1deac;hp=174b184a00d6435c723b51159c91aa173e99c7ca;p=mirror%2Fdsa-puppet.git Merge branch 'master' of git+ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet * 'master' of git+ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet: udd port from master disable master->samosa forward s/org/srv/ --- diff --git a/modules/sudo/files/sudoers b/modules/sudo/files/sudoers index c6d963ade..0afe28651 100644 --- a/modules/sudo/files/sudoers +++ b/modules/sudo/files/sudoers @@ -22,14 +22,14 @@ Defaults passprompt="[sudo] password for %u on %h: " Defaults secure_path="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin" # Host alias specification -Host_Alias QAHOSTS = master, quantz, stabile +Host_Alias QAHOSTS = quantz, stabile Host_Alias WEBHOSTS = wolkenstein Host_Alias SECHOSTS = chopin Host_Alias FTPHOSTS = franck, morricone Host_Alias ZIVITHOSTS = zelenka, zandonai Host_Alias AACRAIDHOSTS = bellini, morricone, paganini, respighi, beethoven, pettersson Host_Alias MEGARAIDHOSTS = grieg, rautavaara, sibelius -Host_Alias MPTRAIDHOSTS = master, fasch, holter, barber, biber, cilea, vitry, krenek, orff +Host_Alias MPTRAIDHOSTS = old-master, fasch, holter, barber, biber, cilea, vitry, krenek, orff Host_Alias MEGACTLHOSTS = lindberg, englund, nielsen Host_Alias LISTHOSTS = bendel