X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=modules%2Fnamed%2Ftemplates%2Fnamed.conf.options.erb;h=9f03983949cf9af336c33b42703a25a891be3ccf;hb=HEAD;hp=762039894e4e86149fe3a1ccf596e439016dc1e7;hpb=7b368189c4367bd0c2bf902d58c4c2a05d05c9ce;p=mirror%2Fdsa-puppet.git

diff --git a/modules/named/templates/named.conf.options.erb b/modules/named/templates/named.conf.options.erb
index 762039894..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,19 +16,8 @@ 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
--%>
-
-<% if classes.include?('named::authoritative') or classes.include?('named::geodns') -%>
 	dnssec-enable yes;
 	dnssec-validation yes;
-<% 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
@@ -53,11 +30,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;
 	};
@@ -75,3 +48,4 @@ logging {
 };
 
 include "/etc/bind/named.conf.puppet-shared-keys";
+include "/etc/bind/named.conf.puppet-misc";