projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'fordsa' of https://git.adam-barratt.org.uk/git/mirror/dsa-puppet
[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
203d2a5
..
9f03983
100644
(file)
--- 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
//
// 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";
options {
directory "/var/cache/bind";
@@
-28,28
+16,8
@@
options {
blackhole { 192.168.0.0/16; 10.0.0.0/8; 172.16.0.0/12; };
<% end -%>
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;
dnssec-enable yes;
dnssec-validation yes;
-<% end -%>
-
-<% if scope.function_has_role(['dns_secondary']) -%>
- rate-limit {
- responses-per-second 25;
- window 5;
- slip 5;
- qps-scale 250;
- };
-<% 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
// 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
@@
-62,11
+30,7
@@
options {
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;
};
print-time yes;
print-category yes;
};
@@
-83,6
+47,5
@@
logging {
};
};
-<% if classes.include?('named::authoritative') -%>
include "/etc/bind/named.conf.puppet-shared-keys";
include "/etc/bind/named.conf.puppet-shared-keys";
-<% end -%>
+include "/etc/bind/named.conf.puppet-misc";