Skip to content
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

Jump to bottom

Add more changes relating to authorative only servers #53

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add more changes relating to authorative only servers #53

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
24 changes: 19 additions & 5 deletions manifests/server/conf.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,18 @@
# $dnssec_enable:
# Enable DNSSEC support. Default: 'yes'
# $dnssec_validation:
# Enable DNSSEC validation. Default: 'yes'
# Enable DNSSEC validation. Default: 'auto'
# $dnssec_lookaside:
# DNSSEC lookaside type. Default: 'auto'
# DNSSEC lookaside type. Default: empty
# $bindkeys_file:
# The pathname of a file to override the built-in trusted keys provided by named
# $hostname
# The host-name (a quotes string) the server should report via a query of the
# name hostname.bind with type TXT, class CHAOS. Specifying none disables.
# Defaut: None
# $server_id
# The ID the server will return via a query for ID.SERVER with type TXT,
# under class CH (CHAOS). Default: empty
# $zones:
# Hash of managed zones and their configuration. The key is the zone name
# and the value is an array of config lines. Default: empty
Expand Down Expand Up @@ -102,18 +111,23 @@
$check_names = [],
$extra_options = {},
$dnssec_enable = 'yes',
$dnssec_validation = 'yes',
$dnssec_lookaside = 'auto',
$dnssec_validation = 'auto',
$dnssec_lookaside = undef,
$bindkeys_file = undef,
$hostname = 'none',
$server_id = undef,
$zones = {},
$includes = [],
$views = {},
) {

# Everything is inside a single template
file { $directory:
ensure => directory,
}
file { $title:
notify => Class['bind::service'],
content => template('bind/named.conf.erb'),
}

}

2 changes: 1 addition & 1 deletion manifests/server/file.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
define bind::server::file (
$zonedir = '/var/named',
$owner = 'root',
$group = undef,
$group = $::bind::params::bindgroup,
$mode = '0640',
$dirmode = '0750',
$source = undef,
Expand Down
10 changes: 7 additions & 3 deletions templates/named.conf.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,11 +81,16 @@ options {

<% end -%>
dnssec-enable <%= @dnssec_enable %>;
<%- if @recursion == 'yes' -%>
dnssec-validation <%= @dnssec_validation %>;
<%- if @dnssec_lookaside -%>
dnssec-lookaside <%= @dnssec_lookaside %>;
<% end -%>

/* Path to ISC DLV key */
bindkeys-file "/etc/named.iscdlv.key";
<%- if @bindkeys_file -%>
bindkeys-file "<%= @bindkeys_file %>";
<% end -%>
<% end -%>
};

logging {
Expand Down Expand Up @@ -143,7 +148,6 @@ view "<%= key %>" {
};
<% end -%>
<% else -%><%# end views, start no views -%>

<% if @recursion == 'yes' -%>
zone "." IN {
type hint;
Expand Down