unkinben/puppet-bind
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Lint cleanup

Browse Source
This commit is contained in:
Nate Riffe 2014-12-11 07:12:19 -06:00
parent 259c704b51
commit ac852d2e5b
5 changed files with 24 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
manifests/init.pp
View File

@ -15,14 +15,14 @@ class bind (
ensure => present, ensure => present,
owner => 'root', owner => 'root',
group => $::bind::params::bind_group, group => $::bind::params::bind_group,
mode => 0644, mode => '0644',
require => Package['bind'], require => Package['bind'],
notify => Service['bind'], notify => Service['bind'],
} }
package { 'bind': package { 'bind':
name => $::bind::params::bind_package,
ensure => latest, ensure => latest,
name => $::bind::params::bind_package,
} }
file { $::bind::params::bind_files: file { $::bind::params::bind_files:
@ -41,7 +41,7 @@ class bind (
file { [ $confdir, "${confdir}/zones" ]: file { [ $confdir, "${confdir}/zones" ]:
ensure => directory, ensure => directory,
mode => 2755, mode => '2755',
purge => true, purge => true,
recurse => true, recurse => true,
} }
@ -70,33 +70,33 @@ class bind (
notify => Service['bind'], notify => Service['bind'],
} }
concat::fragment { "named-acls-header": concat::fragment { 'named-acls-header':
order => '00', order => '00',
target => "${confdir}/acls.conf", target => "${confdir}/acls.conf",
content => "# This file is managed by puppet - changes will be lost\n", content => "# This file is managed by puppet - changes will be lost\n",
} }
concat::fragment { "named-keys-header": concat::fragment { 'named-keys-header':
order => '00', order => '00',
target => "${confdir}/keys.conf", target => "${confdir}/keys.conf",
content => "# This file is managed by puppet - changes will be lost\n", content => "# This file is managed by puppet - changes will be lost\n",
} }
concat::fragment { "named-keys-rndc": concat::fragment { 'named-keys-rndc':
order => '99', order => '99',
target => "${confdir}/keys.conf", target => "${confdir}/keys.conf",
content => "#include \"${confdir}/rndc.key\"\n", content => "#include \"${confdir}/rndc.key\"\n",
} }
concat::fragment { "named-views-header": concat::fragment { 'named-views-header':
order => '00', order => '00',
target => "${confdir}/views.conf", target => "${confdir}/views.conf",
content => "# This file is managed by puppet - changes will be lost\n", content => "# This file is managed by puppet - changes will be lost\n",
} }
service { 'bind': service { 'bind':
name => $::bind::params::bind_service,
ensure => running, ensure => running,
name => $::bind::params::bind_service,
enable => true, enable => true,
hasrestart => true, hasrestart => true,
hasstatus => true, hasstatus => true,

2
manifests/key.pp
View File

@ -2,9 +2,9 @@
define bind::key ( define bind::key (
$algorithm = 'hmac-sha256', $algorithm = 'hmac-sha256',
$secret,
$owner = 'root', $owner = 'root',
$group = $bind::params::bind_group, $group = $bind::params::bind_group,
$secret,
) { ) {
$keydir = $::bind::keydir::keydir $keydir = $::bind::keydir::keydir

2
manifests/updater.pp
View File

@ -5,8 +5,8 @@ class bind::updater (
$keydir = "${::bind::params::confdir}/keys", $keydir = "${::bind::params::confdir}/keys",
) inherits bind::params { ) inherits bind::params {
package {'nsupdate': package {'nsupdate':
name => $nsupdate_package,
ensure => present, ensure => present,
name => $nsupdate_package,
} }
file { $::bind::params::confdir: file { $::bind::params::confdir:

10
manifests/zone.pp
View File

@ -1,7 +1,6 @@
# ex: syntax=puppet si ts=4 sw=4 et # ex: syntax=puppet si ts=4 sw=4 et
define bind::zone ( define bind::zone (
$zone_type,
$domain = '', $domain = '',
$masters = '', $masters = '',
$allow_updates = '', $allow_updates = '',
@ -14,6 +13,7 @@ define bind::zone (
$forwarders = '', $forwarders = '',
$forward = '', $forward = '',
$source = '', $source = '',
$zone_type,
) { ) {
$cachedir = $bind::cachedir $cachedir = $bind::cachedir
@ -58,12 +58,16 @@ define bind::zone (
if $dnssec { if $dnssec {
exec { "dnssec-keygen-${name}": 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, cwd => $cachedir,
user => $bind::params::bind_user, user => $bind::params::bind_user,
creates => "${cachedir}/${name}/${_domain}.signed", creates => "${cachedir}/${name}/${_domain}.signed",
timeout => 0, # crypto is hard 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": file { "${cachedir}/${name}/${_domain}.signed":