From: Stephen Gran <steve@lobefin.net>
Date: Tue, 29 Mar 2011 19:12:11 +0000 (+0100)
Subject: Merge branch 'master' of ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=816f97a070a1f8e1d2b89492697a7d9288ffe846;hp=ba65c0a7a2b53cc5013050997b6f6e9ec44397f5;p=mirror%2Fdsa-puppet.git

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

diff --git a/modules/debian-org/misc/local.yaml b/modules/debian-org/misc/local.yaml
index 3436b494a..fa3f42dcf 100644
--- a/modules/debian-org/misc/local.yaml
+++ b/modules/debian-org/misc/local.yaml
@@ -271,6 +271,7 @@ host_settings:
     - ries.debian.org
     - rietz.debian.org
     - rossini.debian.org
+    - saens.debian.org
     - salieri.debian.org
     - samosa.debian.org
     - santoro.debian.org
@@ -278,6 +279,7 @@ host_settings:
     - schein.debian.org
     - schuetz.debian.org
     - schumann.debian.org
+    - senfl.debian.org
     - sibelius.debian.org
     - smetana.debian.org
     - soler.debian.org
diff --git a/modules/named/templates/named.conf.options.erb b/modules/named/templates/named.conf.options.erb
index 4cb466ea2..294cbb041 100644
--- a/modules/named/templates/named.conf.options.erb
+++ b/modules/named/templates/named.conf.options.erb
@@ -20,7 +20,7 @@ options {
 	directory "/var/cache/bind";
 
 	auth-nxdomain no;    # conform to RFC1035
-<% if classes.include?("named::geodns") -%>
+<% if classes.include?("named::geodns") or %w{senfl}.include?(hostname) -%>
 	listen-on { ! 127.0.0.1; any; };
 	listen-on-v6 { ! ::1; any; };
 <% else -%>
@@ -35,7 +35,7 @@ options {
 
 <%=
   allowed='Nagios; '
-  if classes.include?('named::authoritative') or classes.include?('named::recursor')
+  if (classes.include?('named::authoritative') and not %w{senfl}.include?(hostname)) or classes.include?('named::recursor')
     allowed += 'localnets; '
   end