X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fnamed%2Ftemplates%2Fnamed.conf.options.erb;h=9f03983949cf9af336c33b42703a25a891be3ccf;hb=0da1af36e2aa3aafc65e54135c7ec36da7acff91;hp=cfb1a704c64a1a0c936d9dcb5b39e8e4d02c4ec5;hpb=065af2fbf6d59747e3e310add7aec8c6f4dc3425;p=mirror%2Fdsa-puppet.git

diff --git a/modules/named/templates/named.conf.options.erb b/modules/named/templates/named.conf.options.erb
index cfb1a704c..9f0398394 100644
--- a/modules/named/templates/named.conf.options.erb
+++ b/modules/named/templates/named.conf.options.erb
@@ -3,18 +3,6 @@
 // USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git
 //
 
-acl Nagios {
-<%=
-  roles = scope.lookupvar('site::roles')
-  str = ''
-  roles['nagiosmaster'].each do |node|
-          scope.lookupvar('site::allnodeinfo')[node]['ipHostNumber'].each do |ip|
-              str += "\t" + ip + "/32;\n"
-          end
-  end
-  str-%>
-};
-
 options {
 	directory "/var/cache/bind";
 
@@ -28,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;