Get file and concat dependencies in order

This commit is contained in:
Nate Riffe 2012-09-25 23:01:23 -05:00
parent b26cc808c9
commit 64f10b4774
4 changed files with 17 additions and 9 deletions

View File

@ -5,6 +5,8 @@ class bind (
$dnssec = true, $dnssec = true,
) inherits bind::params { ) inherits bind::params {
include concat::setup
$auth_nxdomain = false $auth_nxdomain = false
package { $bind::params::bind_package: package { $bind::params::bind_package:
@ -35,13 +37,15 @@ class bind (
mode => '0644', mode => '0644',
content => template('bind/named.conf.erb'), content => template('bind/named.conf.erb'),
notify => Service[$bind::params::bind_service], notify => Service[$bind::params::bind_service],
require => Package[$bind::params::bind_package],
} }
file { [ "${confdir}/zones", "${confdir}/keys" ]: file { [ "${confdir}/zones", "${confdir}/keys" ]:
ensure => directory, ensure => directory,
owner => 'root', owner => 'root',
group => $bind::params::bind_group, group => $bind::params::bind_group,
mode => '0755', mode => '0755',
require => Package[$bind::params::bind_package],
} }
concat { [ concat { [
@ -49,10 +53,11 @@ class bind (
"${confdir}/keys.conf", "${confdir}/keys.conf",
"${confdir}/views.conf", "${confdir}/views.conf",
]: ]:
owner => 'root', owner => 'root',
group => $bind::params::bind_group, group => $bind::params::bind_group,
mode => '0644', mode => '0644',
notify => Service[$bind::params::bind_service], notify => Service[$bind::params::bind_service],
require => Package[$bind::params::bind_package],
} }
concat::fragment { "named-acls-header": concat::fragment { "named-acls-header":

View File

@ -11,6 +11,7 @@ define bind::key (
mode => '0640', mode => '0640',
content => template('bind/key.conf.erb'), content => template('bind/key.conf.erb'),
notify => Service[$bind::params::bind_service], notify => Service[$bind::params::bind_service],
require => Package[$bind::params::bind_package],
} }
concat::fragment { "bind-key-${name}": concat::fragment { "bind-key-${name}":
order => '10', order => '10',

View File

@ -24,6 +24,7 @@ define bind::zone (
mode => '0644', mode => '0644',
replace => false, replace => false,
source => 'puppet:///modules/bind/db.empty', source => 'puppet:///modules/bind/db.empty',
require => Package[$bind::params::bind_package],
} }
} }
} }
@ -35,6 +36,7 @@ define bind::zone (
mode => '0644', mode => '0644',
content => template('bind/zone.conf.erb'), content => template('bind/zone.conf.erb'),
notify => Service[$bind::params::bind_service], notify => Service[$bind::params::bind_service],
require => Package[$bind::params::bind_package],
} }
} }

View File

@ -1,5 +1,5 @@
key <%= name %> { key <%= name %> {
algorithm <%= algorithm %>; algorithm <%= algorithm %>;
secret <%= secret %>; secret "<%= secret %>";
}; };