icinga2::config: outsource parent directory creation into module `parent_dirs'

refs #6842
This commit is contained in:
Alexander Klimov 2014-09-10 18:02:00 +02:00
parent 413634280e
commit 03100d0d9a
2 changed files with 8 additions and 6 deletions

View File

@ -24,12 +24,8 @@ define icinga2::config ($source) {
include icinga2
$path = "/etc/icinga2/${name}.conf"
$cmd = "mkdir-p-for-${path}"
exec { $cmd:
command => "mkdir -p \"\$(dirname \"\$(readlink -m '${path}')\")\"",
path => '/bin:/usr/bin',
}
parent_dirs { $path: }
file { $path:
source => "${source}/${name}.conf",
@ -37,7 +33,7 @@ define icinga2::config ($source) {
group => 'icinga',
notify => Service['icinga2'],
require => [
Exec[$cmd],
Parent_dirs[$path],
User['icinga']
],
}

View File

@ -0,0 +1,6 @@
define parent_dirs {
exec { "parent_dirs-${name}":
command => "mkdir -p \"\$(dirname \"\$(readlink -m '${name}')\")\"",
path => '/bin:/usr/bin',
}
}