ravel onto squeeze

diff --git a/modules/debian-org/misc/local.yaml b/modules/debian-org/misc/local.yaml
index cbdadf1e4980466fd7d5ef7add112d91086e7474..4bcd3555048fdf7bd6345d31bb02263a29fa58e5 100644 (file)
--- a/modules/debian-org/misc/local.yaml
+++ b/modules/debian-org/misc/local.yaml
@@ -277,6 +277,7 @@ host_settings:
     - quantz.debian.org
     - raff.debian.org
     - rautavaara.debian.org
+    - ravel.debian.org
     - reger.debian.org
     - rem.debian.org
     - respighi.debian.org

diff --git a/modules/named/templates/named.conf.options.erb b/modules/named/templates/named.conf.options.erb
index aa9be9b13d8b5cb590ea0c57a87035ee207a813d..7b31d185ffe7eb390c40a04f0b6218c3d304c0cf 100644 (file)
--- 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") or %w{diamond orff senfl}.include?(hostname) -%>
+<% if classes.include?("named::geodns") or %w{diamond orff senfl ravel}.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') and not %w{diamond orff senfl}.include?(hostname)) or classes.include?('named::recursor')
+  if (classes.include?('named::authoritative') and not %w{diamond orff senfl ravel}.include?(hostname)) or classes.include?('named::recursor')
     allowed += 'localnets; '
   end