Try to avoid reserved site keyword

[mirror/dsa-puppet.git] / modules / named / templates / named.conf.options.erb

diff --git a/modules/named/templates/named.conf.options.erb b/modules/named/templates/named.conf.options.erb
index ede58e2..83f1f63 100644 (file)
--- a/modules/named/templates/named.conf.options.erb
+++ b/modules/named/templates/named.conf.options.erb
@@ -5,12 +5,16 @@
 
 acl Nagios {
 <%=
-  roles = scope.lookupvar('site::roles')
+  roles = scope.lookupvar('deprecated::roles')
   str = ''
   roles['nagiosmaster'].each do |node|
-          scope.lookupvar('site::allnodeinfo')[node]['ipHostNumber'].each do |ip|
-              str += "\t" + ip + "/32;\n"
-          end
+          str += scope.lookupvar('deprecated::allnodeinfo')[node]['ipHostNumber'].collect do |ip|
+              if ip =~ /:/
+                  "\t#{ip}/128;\n"
+              else
+                  "\t#{ip}/32;\n"
+              end
+          end.join("")
   end
   str-%>
 };
@@ -37,19 +41,13 @@ options {
   str
 -%>
 
-<% if classes.include?('named::authoritative') or classes.include?('named::geodns') -%>
        dnssec-enable yes;
        dnssec-validation yes;
-<% end -%>
 
-<% if scope.function_has_role(['dns_secondary']) -%>
-       rate-limit {
-               responses-per-second 25;
-               window 5;
-               slip 5;
-               qps-scale 250;
-       };
-<% end -%>
+       // Defaults are 100 and 10, causing lots and lots of tiny updates.
+       // This way, I hope, we'll get fewer (and thus bigger) updates. -- weasel
+       sig-signing-nodes 5000;
+       sig-signing-signatures 1000;
 
        max-journal-size 100K;
 };
@@ -57,11 +55,7 @@ options {
 logging {
 
        channel queries {
-<% if classes.include?('named::geodns') -%>
-               file "/var/log/bind9/geoip-query.log" versions 4 size 40m;
-<% else -%>
                file "/var/log/bind9/named-query.log" versions 4 size 40m;
-<% end -%>
                print-time yes;
                print-category yes;
        };
@@ -78,6 +72,5 @@ logging {
 
 };
 
-<% if classes.include?('named::authoritative') -%>
 include "/etc/bind/named.conf.puppet-shared-keys";
-<% end -%>
+include "/etc/bind/named.conf.puppet-misc";