Skip to content

Improved param handling #214

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Improved param handling #214

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5331a35
Allow key things to be overriden (eg in Hiera)
lingfish Apr 12, 2017
c02ef16
Cosmetic typo fix
lingfish Apr 12, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion manifests/acl.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,14 @@
$aclname = $name,
$data = [],
) {
# Is this redudant now, or do we include dns::server base?
include dns::server::params

validate_string($aclname)
validate_array($data)

concat::fragment { "named.conf.local.acl.${name}.include":
target => "${dns::server::params::cfg_dir}/named.conf.local",
target => "${dns::server::cfg_dir}/named.conf.local",
order => 2,
content => template("${module_name}/acl.erb"),
}
Expand Down
4 changes: 2 additions & 2 deletions manifests/server/options.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@
$check_names_master = undef,
$check_names_slave = undef,
$check_names_response = undef,
$data_dir = $::dns::server::params::data_dir,
$data_dir = $::dns::server::data_dir,
$dnssec_validation = $::dns::server::params::default_dnssec_validation,
$dnssec_enable = $::dns::server::params::default_dnssec_enable,
$forward_policy = undef,
Expand All @@ -147,10 +147,10 @@
$transfer_source = undef,
$working_dir = $::dns::server::params::working_dir,
$zone_notify = undef,
$cfg_dir = $::dns::server::cfg_dir,
) {
$valid_check_names = ['fail', 'warn', 'ignore']
$valid_forward_policy = ['first', 'only']
$cfg_dir = $::dns::server::params::cfg_dir

if ! defined(Class['::dns::server']) {
fail('You must include the ::dns::server base class before using any dns options defined resources')
Expand Down
6 changes: 2 additions & 4 deletions manifests/zone.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,11 +174,9 @@
$zone_notify = undef,
$also_notify = [],
$ensure = present,
$data_dir = $::dns::server::params::data_dir,
$data_dir = $::dns::server::data_dir,
$cfg_dir = $::dns::server::cfg_dir,
) {

$cfg_dir = $dns::server::params::cfg_dir

validate_array($allow_transfer)
validate_array($allow_forwarder)
if !member(['first', 'only'], $forward_policy) {
Expand Down
4 changes: 2 additions & 2 deletions templates/zone.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ zone "<%= @zone %>" {
<% end -%>
<% if @zone_type == 'slave' or @zone_type == 'stub' -%>
<%- if @slave_masters.is_a?(Array) -%>
masters { <%= @slave_masters.join(";") %>;};
masters { <%= @slave_masters.join(";") %>; };
<%- else -%>
masters { <%= @slave_masters %>;};
masters { <%= @slave_masters %>; };
<%- end -%>
<% elsif @zone_type == 'master' -%>
<%- if @allow_transfer.is_a?(Array) and @allow_transfer.size != 0 -%>
Expand Down