X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=inline;f=modules%2Fnamed%2Ftemplates%2Fnamed.conf.options.erb;h=ede58e220b2033a5306403e9a911907d3fdab8ee;hb=4ab4184b7ed2da472e75a998f93bad4f064731df;hp=8bc2f87d1065dcbf2df9439080e1f680a858a785;hpb=b783bf06da0040034c506ec529a625ed074b1c01;p=mirror%2Fdsa-puppet.git

diff --git a/modules/named/templates/named.conf.options.erb b/modules/named/templates/named.conf.options.erb
index 8bc2f87d1..ede58e220 100644
--- a/modules/named/templates/named.conf.options.erb
+++ b/modules/named/templates/named.conf.options.erb
@@ -5,13 +5,12 @@
 
 acl Nagios {
 <%=
+  roles = scope.lookupvar('site::roles')
   str = ''
-  scope.lookupvar('site::localinfo').keys.sort.each do |node|
-      if scope.lookupvar('site::localinfo')[node]['nagiosmaster']
+  roles['nagiosmaster'].each do |node|
           scope.lookupvar('site::allnodeinfo')[node]['ipHostNumber'].each do |ip|
               str += "\t" + ip + "/32;\n"
           end
-      end
   end
   str-%>
 };
@@ -43,7 +42,7 @@ options {
 	dnssec-validation yes;
 <% end -%>
 
-<% if %w{senfl ravel orff diamond rietz}.include?(hostname) -%>
+<% if scope.function_has_role(['dns_secondary']) -%>
 	rate-limit {
 		responses-per-second 25;
 		window 5;
@@ -52,6 +51,7 @@ options {
 	};
 <% end -%>
 
+	max-journal-size 100K;
 };
 
 logging {
@@ -67,6 +67,17 @@ logging {
 	};
 	category queries { queries; };
 	category lame-servers { null; };
+
+	channel transfers {
+		file "/var/log/bind9/named-transfers.log" versions 4 size 40m;
+		print-time yes;
+		print-category yes;
+	};
+	category xfer-out { transfers; };
+	category notify { transfers; };
+
 };
 
- 
+<% if classes.include?('named::authoritative') -%>
+include "/etc/bind/named.conf.puppet-shared-keys";
+<% end -%>