Compare commits

..

No commits in common. "1cf2e7c923d50adab02d92076402a7cffe30ca51" and "2076433243eefb876d0b2737b1608a914620620d" have entirely different histories.

5 changed files with 14 additions and 16 deletions

View File

@ -25,7 +25,7 @@ class bind::defaults (
$chroot_class = undef, $chroot_class = undef,
$chroot_dir = undef, $chroot_dir = undef,
) { ) {
unless $supported.is_a(Boolean) { unless is_bool($supported) {
fail('Please ensure that the dependencies of the bind module are installed and working correctly') fail('Please ensure that the dependencies of the bind module are installed and working correctly')
} }

View File

@ -4,7 +4,7 @@ define bind::key (
$secret = undef, $secret = undef,
$secret_bits = 256, $secret_bits = 256,
$algorithm = 'hmac-sha256', $algorithm = 'hmac-sha256',
$owner = $::bind::defaults::bind_user, $owner = 'root',
$group = $::bind::defaults::bind_group, $group = $::bind::defaults::bind_group,
$keydir = $::bind::keydir::keydir, $keydir = $::bind::keydir::keydir,
$keyfile = undef, $keyfile = undef,
@ -35,7 +35,7 @@ define bind::key (
ensure => present, ensure => present,
owner => $owner, owner => $owner,
group => $group, group => $group,
mode => '0400', mode => '0640',
replace => $replace, replace => $replace,
content => template('bind/key.conf.erb'), content => template('bind/key.conf.erb'),
} }

View File

@ -2,13 +2,9 @@
class bind::keydir ( class bind::keydir (
$keydir, $keydir,
$owner = $::bind::defaults::bind_user,
$group = $::bind::defaults::bind_group,
) { ) {
file { $keydir: file { $keydir:
ensure => directory, ensure => directory,
mode => '0755', mode => '0755',
owner => $owner,
group => $group,
} }
} }

View File

@ -1,12 +1,12 @@
{ {
"name": "inkblot-bind", "name": "inkblot-bind",
"version": "7.4.0", "version": "7.4.0",
"author": "souldo", "author": "inkblot",
"license": "Apache-2.0", "license": "Apache-2.0",
"summary": "ISC BIND name server <-- forked from inkblot", "summary": "ISC BIND name server",
"source": "git://github.com/matthewrstone/puppet-bind.git", "source": "git://github.com/inkblot/puppet-bind.git",
"project_page": "https://github.com/matthewrstone/puppet-bind", "project_page": "https://github.com/inkblot/puppet-bind",
"issues_url": "https://github.com/matthewrstone/puppet-bind/issues", "issues_url": "https://github.com/inkblot/puppet-bind/issues",
"tags": [ "bind", "dns", "dnssec", "nsupdate" ], "tags": [ "bind", "dns", "dnssec", "nsupdate" ],
"operatingsystem_support": [ "operatingsystem_support": [
{ {
@ -15,7 +15,7 @@
}, },
{ {
"operatingsystem": "Ubuntu", "operatingsystem": "Ubuntu",
"operatingsystemrelease": [ "22.04" ] "operatingsystemrelease": [ "12.04", "14.04", "16.04" ]
}, },
{ {
"operatingsystem": "CentOS", "operatingsystem": "CentOS",
@ -27,7 +27,8 @@
} }
], ],
"dependencies": [ "dependencies": [
{ "name": "puppetlabs/stdlib", "version_requirement": ">= 4.15.0 < 10.0.0" }, { "name": "puppetlabs/stdlib", "version_requirement": ">= 4.15.0 < 5.0.0" },
{ "name": "puppetlabs/concat", "version_requirement": ">= 2.2.1 < 5.0.0" } { "name": "puppetlabs/concat", "version_requirement": ">= 2.2.1 < 5.0.0" }
] ],
"data_provider": "hiera"
} }

View File

@ -27,13 +27,14 @@ options {
forward <%= @forward %>; forward <%= @forward %>;
<%- end -%> <%- end -%>
auth-nxdomain <%= @auth_nxdomain ? 'yes' : 'no' %>; auth-nxdomain <%= @auth_nxdomain ? 'yes' : 'no' %>;
listen-on { any; };
listen-on-v6 { any; }; listen-on-v6 { any; };
dnssec-enable <%= @dnssec ? 'yes' : 'no' %>;
<%- if @filter_ipv6 -%> <%- if @filter_ipv6 -%>
filter-aaaa-on-v4 yes; filter-aaaa-on-v4 yes;
<%- end -%> <%- end -%>
<%- if @dnssec -%> <%- if @dnssec -%>
dnssec-validation yes; dnssec-validation yes;
dnssec-lookaside auto;
<%- if @isc_bind_keys -%> <%- if @isc_bind_keys -%>
bindkeys-file "<%= @isc_bind_keys %>"; bindkeys-file "<%= @isc_bind_keys %>";
<%- end -%> <%- end -%>