projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rore on squeeze
[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
e98dc67
..
aa9be9b
100644
(file)
--- a/
modules/named/templates/named.conf.options.erb
+++ b/
modules/named/templates/named.conf.options.erb
@@
-20,7
+20,7
@@
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::geodns") or %w{
saens}.include
(hostname) -%>
+<% if classes.include?("named::geodns") or %w{
diamond orff senfl}.include?
(hostname) -%>
listen-on { ! 127.0.0.1; any; };
listen-on-v6 { ! ::1; any; };
<% else -%>
listen-on { ! 127.0.0.1; any; };
listen-on-v6 { ! ::1; any; };
<% else -%>
@@
-35,7
+35,7
@@
options {
<%=
allowed='Nagios; '
<%=
allowed='Nagios; '
- if
classes.include?('named::authoritative'
) or classes.include?('named::recursor')
+ if
(classes.include?('named::authoritative') and not %w{diamond orff senfl}.include?(hostname)
) or classes.include?('named::recursor')
allowed += 'localnets; '
end
allowed += 'localnets; '
end