X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fnamed%2Ftemplates%2Fnamed.conf.options.erb;h=9f03983949cf9af336c33b42703a25a891be3ccf;hb=8efc3cb29ac84aed50f87cc92ad50a6d21a10f8a;hp=83f1f638c94365de51e2075ab2bdcf5561bb2d75;hpb=f77499d4ba53abb8e56b1923d25fb1b828e46328;p=mirror%2Fdsa-puppet.git

diff --git a/modules/named/templates/named.conf.options.erb b/modules/named/templates/named.conf.options.erb
index 83f1f638c..9f0398394 100644
--- a/modules/named/templates/named.conf.options.erb
+++ b/modules/named/templates/named.conf.options.erb
@@ -3,22 +3,6 @@
 // USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git
 //
 
-acl Nagios {
-<%=
-  roles = scope.lookupvar('deprecated::roles')
-  str = ''
-  roles['nagiosmaster'].each do |node|
-          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-%>
-};
-
 options {
 	directory "/var/cache/bind";
 
@@ -32,15 +16,6 @@ options {
 	blackhole { 192.168.0.0/16; 10.0.0.0/8; 172.16.0.0/12; };
 <% end -%>
 
-<%=
-  allowed='Nagios; '
-
-  str =  "\tallow-recursion { " + allowed + " };\n"
-  str += "\tallow-query { " + allowed + " };\n"
-
-  str
--%>
-
 	dnssec-enable yes;
 	dnssec-validation yes;