projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Drop HOST_PGBACKUPHOST_V4 and HOST_PGBACKUPHOST_V6
[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
cfb1a70
..
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,15
+16,6
@@
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
--%>
-
dnssec-enable yes;
dnssec-validation yes;
dnssec-enable yes;
dnssec-validation yes;