From: Martin Zobel-Helas <zobel@debian.org>
Date: Sun, 22 Jan 2012 20:21:15 +0000 (+0100)
Subject: add bendel
X-Git-Url: https://git.donarmstrong.com/?p=dsa-puppet.git;a=commitdiff_plain;h=39cbeb0d1b398f131910409f7ae7aa491bbba992

add bendel
Signed-off-by: Martin Zobel-Helas <zobel@debian.org>
---

diff --git a/manifests/site.pp b/manifests/site.pp
index f94264ca..d45bc4ff 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -115,7 +115,7 @@ node default {
     case $hostname {
         ravel,senfl,orff,draghi,diamond: { include named::authoritative }
         geo1,geo2,geo3:                          { include named::geodns }
-        liszt:                                   { include named::recursor }
+        liszt,bendel:                            { include named::recursor }
     }
     case $hostname {
         franck,master,lobos,samosa,spohr,widor:   { include unbound }
diff --git a/modules/ferm/manifests/per-host.pp b/modules/ferm/manifests/per-host.pp
index 486b0327..5591dbc4 100644
--- a/modules/ferm/manifests/per-host.pp
+++ b/modules/ferm/manifests/per-host.pp
@@ -94,7 +94,7 @@ class ferm::per-host {
                 rule            => "&SERVICE(tcp, 6523)"
             }
         }
-        liszt: {
+        bendel,liszt: {
             @ferm::rule { "smtp":
                 domain          => "(ip ip6)",
                 description     => "Allow smtp access",
diff --git a/modules/resolv/templates/resolv.conf.erb b/modules/resolv/templates/resolv.conf.erb
index 531b5165..9ca7bd92 100644
--- a/modules/resolv/templates/resolv.conf.erb
+++ b/modules/resolv/templates/resolv.conf.erb
@@ -8,7 +8,7 @@ nameservers = []
 searchpaths = []
 options = []
 
-if %w{draghi liszt}.include?(hostname)
+if %w{draghi liszt bendel}.include?(hostname)
   nameservers << "127.0.0.1"
 end
 
diff --git a/modules/sudo/files/common/sudoers b/modules/sudo/files/common/sudoers
index e0ab7043..ae5fa78d 100644
--- a/modules/sudo/files/common/sudoers
+++ b/modules/sudo/files/common/sudoers
@@ -31,6 +31,7 @@ Host_Alias	AACRAIDHOSTS	= bellini, morricone, paganini, respighi, vivaldi, beeth
 Host_Alias	MEGARAIDHOSTS	= grieg, rautavaara, sibelius
 Host_Alias	MPTRAIDHOSTS	= master, fasch, holter, barber, biber, cilea, vitry, krenek, scelsi, orff, field
 Host_Alias	MEGACTLHOSTS	= lindberg, englund, heininen, nielsen
+Host_Alias  LISTHOSTS   = liszt, bendel
 
 # Cmnd alias specification
 
@@ -92,7 +93,7 @@ nagios		beethoven=(debbackup)	NOPASSWD: /usr/lib/nagios/plugins/dsa-check-backup
 %keyring	ALL=(keyring)	ALL
 %lintian	ALL=(lintian)	ALL
 %listweb	ALL=(listweb)	ALL
-%list		liszt=(list)	ALL
+%list		LISTHOSTS=(list)	ALL
 %mirroradm	ALL=(archvsync)	ALL
 %nm		ALL=(nm)	ALL
 %patch-tracker	ALL=(patch-tracker)	ALL
@@ -158,11 +159,11 @@ dak		SECHOSTS=(archvsync)	NOPASSWD: /home/archvsync/signal_security
 debwww		WEBHOSTS=(archvsync)	NOPASSWD: /home/archvsync/webmirrors/runmirrors
 %press		WEBHOSTS=(debwww)	/org/www.debian.org/update-part News
 # more list stuff
-%list		liszt=(root)		/usr/sbin/postfix reload
-%list		liszt=(root)		/usr/sbin/qshape, /usr/sbin/postsuper
-%list		liszt=(root)		/etc/init.d/spamassassin, /etc/init.d/amavis
-%list		liszt=(amavis)		NOPASSWD: /usr/bin/sa-learn
-%list		liszt=(amavis)		ALL
+%list		LISTHOSTS=(root)		/usr/sbin/postfix reload
+%list		LISTHOSTS=(root)		/usr/sbin/qshape, /usr/sbin/postsuper
+%list		LISTHOSTS=(root)		/etc/init.d/spamassassin, /etc/init.d/amavis
+%list		LISTHOSTS=(amavis)		NOPASSWD: /usr/bin/sa-learn
+%list		LISTHOSTS=(amavis)		ALL
 # geodns may reload bind
 geodnssync	geo1,geo2,geo3=(root)	NOPASSWD: /etc/init.d/bind9 reload
 geodnssync	geo1,geo2,geo3=(root)	NOPASSWD: /usr/sbin/rndc reconfig