massive style guide fixups

[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 8d6027830c35d99aa0c53d366faadad335557a81..4224254d36a6b61b6073952415bc32642166f4ed 100644 (file)
--- a/modules/named/templates/named.conf.options.erb
+++ b/modules/named/templates/named.conf.options.erb
@@ -6,9 +6,9 @@
 acl Nagios {
 <%=
   str = ''
-  localinfo.keys.sort.each do |node|
-      if localinfo[node]['nagiosmaster']
-          ldapall[node]['ipHostNumber'].each do |ip|
+  scope.lookupvar('site::localinfo').keys.sort.each do |node|
+      if scope.lookupvar('site::localinfo')[node]['nagiosmaster']
+          scope.lookupvar('site::allnodeinfo')[node]['ipHostNumber'].each do |ip|
               str += "\t" + ip + "/32;\n"
           end
       end
@@ -20,7 +20,12 @@ options {
        directory "/var/cache/bind";
 
        auth-nxdomain no;    # conform to RFC1035
+<% if classes.include?("named::recursor") -%>
        listen-on-v6 { any; };
+<% else -%>
+       listen-on { ! 127.0.0.1; any; };
+       listen-on-v6 { ! ::1; any; };
+<% end -%>
 
        allow-transfer { none; };
        allow-update { none; };
@@ -30,7 +35,7 @@ options {
 
 <%=
   allowed='Nagios; '
-  if classes.include?('named::secondary') or classes.include?('named::recursor')
+  if classes.include?('named::recursor')
     allowed += 'localnets; '
   end
 
@@ -40,7 +45,7 @@ options {
   str
 -%>
 
-<% if classes.include?('named::secondary') or classes.include?('named::geodns') -%>
+<% if classes.include?('named::authoritative') or classes.include?('named::geodns') -%>
        dnssec-enable yes;
        dnssec-validation yes;
 <% end -%>