Skip to content
Merged
2 changes: 1 addition & 1 deletion manifests/config.pp
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@

concat::fragment { 'options.conf+10-main.dns':
target => $dns::optionspath,
content => template($dns::optionsconf_template),
content => epp($dns::optionsconf_template),
order => '10',
}

Expand Down
5 changes: 4 additions & 1 deletion manifests/init.pp
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,8 @@
# The forward option
# @param forwarders
# The forwarders option
# @param rpz_zones
# Array of zones that will be included in response-policy definition
# @param listen_on
# The listen-on option
# @param listen_on_v6
Expand Down Expand Up @@ -161,6 +163,7 @@
Variant[Enum['unmanaged'], Stdlib::Absolutepath] $defaultzonepath = $dns::params::defaultzonepath,
Optional[Enum['only', 'first']] $forward = undef,
Array[Dns::Forwarder] $forwarders = [],
Array $rpz_zones = undef,
Optional[String] $listen_on = undef,
Variant[String, Boolean] $listen_on_v6 = 'any',
Enum['yes', 'no'] $recursion = 'yes',
Expand All @@ -172,7 +175,7 @@
Enum['yes', 'no', 'auto'] $dnssec_validation = 'auto',
String $namedconf_template = 'dns/named.conf.erb',
Hash[String, Array[String]] $acls = {},
String $optionsconf_template = 'dns/options.conf.erb',
String $optionsconf_template = 'dns/options.conf.epp',
Optional[Stdlib::Absolutepath] $sysconfig_file = $dns::params::sysconfig_file,
Optional[String] $sysconfig_template = $dns::params::sysconfig_template,
Optional[String] $sysconfig_startup_options = $dns::params::sysconfig_startup_options,
Expand Down
51 changes: 51 additions & 0 deletions templates/options.conf.epp
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
directory "<%= $dns::vardir %>";
<% if $dns::forwarders and $dns::forwarders != [] { -%>
forwarders { <%= join($dns::forwarders, '; ') %>; };
<% } -%>
<% if $dns::forward != undef and $dns::forward != '' { -%>
forward <%= $dns::forward %>;
<% } -%>

<% unless empty($dns::rpz_zones) { -%>
response-policy {
<% $dns::rpz_zones.each |$zone| { -%>
zone "<%= $zone %>";
<% } -%>
};
<% } -%>

recursion <%= $dns::recursion %>;
allow-query { <%= join($dns::allow_query, '; ') %>; };
<% if $dns::dnssec_enable != undef and $dns::dnssec_enable != '' and $dns::dnssec_enable != false { -%>
dnssec-enable <%= $dns::dnssec_enable %>;
<% } -%>
dnssec-validation <%= $dns::dnssec_validation %>;

empty-zones-enable <%= $dns::empty_zones_enable %>;

<% if $dns::dns_notify { -%>
notify <%= $dns::dns_notify %>;
<% } -%>
<% if $dns::listen_on { -%>
listen-on { <%= $dns::listen_on %>; };
<% } -%>
<% if $dns::listen_on_v6 { -%>
listen-on-v6 { <%= $dns::listen_on_v6 %>; };
<% } -%>

<% if $dns::allow_recursion { -%>
allow-recursion { <%= join($dns::allow_recursion, '; ') %>; };
<% } -%>

<% if $facts['os']['family'] =~ /^(FreeBSD|DragonFly)$/ { -%>
pid-file "/var/run/named/pid";
<% } -%>

<% $dns::disable_empty_zones.sort.each |$disable_empty_zone| { -%>
disable-empty-zone "<%= $disable_empty_zone %>";
<% } -%>

<% $dns::additional_options.keys.sort.each |$option| { -%>
<% $value = $dns::additional_options[$option] -%>
<%= $option %> <%= $value %>;
<% } -%>
42 changes: 0 additions & 42 deletions templates/options.conf.erb

This file was deleted.

Loading