Lint cleanup
This commit is contained in:
parent
259c704b51
commit
ac852d2e5b
@ -15,14 +15,14 @@ class bind (
|
||||
ensure => present,
|
||||
owner => 'root',
|
||||
group => $::bind::params::bind_group,
|
||||
mode => 0644,
|
||||
mode => '0644',
|
||||
require => Package['bind'],
|
||||
notify => Service['bind'],
|
||||
}
|
||||
|
||||
package { 'bind':
|
||||
name => $::bind::params::bind_package,
|
||||
ensure => latest,
|
||||
name => $::bind::params::bind_package,
|
||||
}
|
||||
|
||||
file { $::bind::params::bind_files:
|
||||
@ -41,7 +41,7 @@ class bind (
|
||||
|
||||
file { [ $confdir, "${confdir}/zones" ]:
|
||||
ensure => directory,
|
||||
mode => 2755,
|
||||
mode => '2755',
|
||||
purge => true,
|
||||
recurse => true,
|
||||
}
|
||||
@ -70,33 +70,33 @@ class bind (
|
||||
notify => Service['bind'],
|
||||
}
|
||||
|
||||
concat::fragment { "named-acls-header":
|
||||
concat::fragment { 'named-acls-header':
|
||||
order => '00',
|
||||
target => "${confdir}/acls.conf",
|
||||
content => "# This file is managed by puppet - changes will be lost\n",
|
||||
}
|
||||
|
||||
concat::fragment { "named-keys-header":
|
||||
concat::fragment { 'named-keys-header':
|
||||
order => '00',
|
||||
target => "${confdir}/keys.conf",
|
||||
content => "# This file is managed by puppet - changes will be lost\n",
|
||||
}
|
||||
|
||||
concat::fragment { "named-keys-rndc":
|
||||
concat::fragment { 'named-keys-rndc':
|
||||
order => '99',
|
||||
target => "${confdir}/keys.conf",
|
||||
content => "#include \"${confdir}/rndc.key\"\n",
|
||||
}
|
||||
|
||||
concat::fragment { "named-views-header":
|
||||
concat::fragment { 'named-views-header':
|
||||
order => '00',
|
||||
target => "${confdir}/views.conf",
|
||||
content => "# This file is managed by puppet - changes will be lost\n",
|
||||
}
|
||||
|
||||
service { 'bind':
|
||||
name => $::bind::params::bind_service,
|
||||
ensure => running,
|
||||
name => $::bind::params::bind_service,
|
||||
enable => true,
|
||||
hasrestart => true,
|
||||
hasstatus => true,
|
||||
|
||||
@ -2,9 +2,9 @@
|
||||
|
||||
define bind::key (
|
||||
$algorithm = 'hmac-sha256',
|
||||
$secret,
|
||||
$owner = 'root',
|
||||
$group = $bind::params::bind_group,
|
||||
$secret,
|
||||
) {
|
||||
$keydir = $::bind::keydir::keydir
|
||||
|
||||
|
||||
@ -5,8 +5,8 @@ class bind::updater (
|
||||
$keydir = "${::bind::params::confdir}/keys",
|
||||
) inherits bind::params {
|
||||
package {'nsupdate':
|
||||
name => $nsupdate_package,
|
||||
ensure => present,
|
||||
name => $nsupdate_package,
|
||||
}
|
||||
|
||||
file { $::bind::params::confdir:
|
||||
|
||||
@ -1,7 +1,6 @@
|
||||
# ex: syntax=puppet si ts=4 sw=4 et
|
||||
|
||||
define bind::zone (
|
||||
$zone_type,
|
||||
$domain = '',
|
||||
$masters = '',
|
||||
$allow_updates = '',
|
||||
@ -14,6 +13,7 @@ define bind::zone (
|
||||
$forwarders = '',
|
||||
$forward = '',
|
||||
$source = '',
|
||||
$zone_type,
|
||||
) {
|
||||
$cachedir = $bind::cachedir
|
||||
|
||||
@ -58,12 +58,16 @@ define bind::zone (
|
||||
|
||||
if $dnssec {
|
||||
exec { "dnssec-keygen-${name}":
|
||||
command => "/usr/local/bin/dnssec-init '${cachedir}' '${name}' '${_domain}' '${key_directory}'",
|
||||
command => "/usr/local/bin/dnssec-init '${cachedir}' '${name}'\
|
||||
'${_domain}' '${key_directory}'",
|
||||
cwd => $cachedir,
|
||||
user => $bind::params::bind_user,
|
||||
creates => "${cachedir}/${name}/${_domain}.signed",
|
||||
timeout => 0, # crypto is hard
|
||||
require => [ File['/usr/local/bin/dnssec-init'], File["${cachedir}/${name}/${_domain}"] ],
|
||||
require => [
|
||||
File['/usr/local/bin/dnssec-init'],
|
||||
File["${cachedir}/${name}/${_domain}"]
|
||||
],
|
||||
}
|
||||
|
||||
file { "${cachedir}/${name}/${_domain}.signed":
|
||||
|
||||
Loading…
Reference in New Issue
Block a user