projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
remove barriere volumes at bytemark, the VM has been moved away
[mirror/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
e093aa4
..
95370b1
100644
(file)
--- a/
modules/named/templates/named.conf.options.erb
+++ b/
modules/named/templates/named.conf.options.erb
@@
-5,13
+5,16
@@
acl Nagios {
<%=
acl Nagios {
<%=
+ roles = scope.lookupvar('site::roles')
str = ''
str = ''
- localinfo.keys.sort.each do |node|
- if localinfo[node]['nagiosmaster']
- allnodeinfo[node]['ipHostNumber'].each do |ip|
- str += "\t" + ip + "/32;\n"
- end
- end
+ roles['nagiosmaster'].each do |node|
+ str += scope.lookupvar('site::allnodeinfo')[node]['ipHostNumber'].collect do |ip|
+ if ip =~ /:/
+ "\t#{ip}/128;\n"
+ else
+ "\t#{ip}/32;\n"
+ end
+ end.join("")
end
str-%>
};
end
str-%>
};
@@
-20,12
+23,8
@@
options {
directory "/var/cache/bind";
auth-nxdomain no; # conform to RFC1035
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; };
listen-on { ! 127.0.0.1; any; };
listen-on-v6 { ! ::1; any; };
-<% end -%>
allow-transfer { none; };
allow-update { none; };
allow-transfer { none; };
allow-update { none; };
@@
-35,9
+34,6
@@
options {
<%=
allowed='Nagios; '
<%=
allowed='Nagios; '
- if classes.include?('named::recursor')
- allowed += 'localnets; '
- end
str = "\tallow-recursion { " + allowed + " };\n"
str += "\tallow-query { " + allowed + " };\n"
str = "\tallow-recursion { " + allowed + " };\n"
str += "\tallow-query { " + allowed + " };\n"
@@
-45,25
+41,36
@@
options {
str
-%>
str
-%>
-<% if classes.include?('named::authoritative') or classes.include?('named::geodns') -%>
dnssec-enable yes;
dnssec-validation yes;
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
+ sig-signing-nodes 5000;
+ sig-signing-signatures 1000;
+
+ max-journal-size 100K;
};
logging {
channel queries {
};
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;
file "/var/log/bind9/named-query.log" versions 4 size 40m;
-<% end -%>
print-time yes;
print-category yes;
};
category queries { queries; };
category lame-servers { null; };
print-time yes;
print-category yes;
};
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; };
+
};
};
-
+include "/etc/bind/named.conf.puppet-shared-keys";
+include "/etc/bind/named.conf.puppet-misc";