diff options
Diffstat (limited to 'manifests/defines')
| -rw-r--r-- | manifests/defines/concatenated_file.pp | 5 | ||||
| -rw-r--r-- | manifests/defines/modules_dir.pp | 9 |
2 files changed, 5 insertions, 9 deletions
diff --git a/manifests/defines/concatenated_file.pp b/manifests/defines/concatenated_file.pp index d605219..8010c88 100644 --- a/manifests/defines/concatenated_file.pp +++ b/manifests/defines/concatenated_file.pp @@ -4,8 +4,6 @@ # Copyright (C) 2007 David Schmitt <david@schmitt.edv-bus.at> # See LICENSE for the full license granted to you. -module_dir { "common/cf": } - # TODO: # * create the directory in _part too @@ -40,11 +38,12 @@ define concatenated_file ( $mode = 0644, $owner = root, $group = 0 ) { + include common::moduledir::common::cf $dir_real = $dir ? { '' => "${name}.d", default => $dir } $tmp_file_name = regsubst($dir_real, '/', '_', 'G') - $tmp_file = "${module_dir_path}/${tmp_file_name}" + $tmp_file = "${common::moduledir::module_dir_path}/${tmp_file_name}" if defined(File[$dir_real]) { debug("${dir_real} already defined") diff --git a/manifests/defines/modules_dir.pp b/manifests/defines/modules_dir.pp index fe0d562..c7cde5b 100644 --- a/manifests/defines/modules_dir.pp +++ b/manifests/defines/modules_dir.pp @@ -10,12 +10,13 @@ define modules_dir ( $mode = 0644, $owner = root, $group = 0 ) { - $dir = "/var/lib/puppet/modules/${name}" + include common::moduledir + $dir = "$common::moduledir::module_dir_path/${name}" if defined(File[$dir]) { debug("${dir} already defined") } else { file { - "/var/lib/puppet/modules/${name}": + $dir: source => [ "puppet://$server/modules/${name}/modules_dir", "puppet://$server/modules/common/empty"], checksum => mtime, # ignore the placeholder @@ -33,7 +34,3 @@ define module_dir ( { modules_dir{$name: mode => $mode, owner => $owner, group => $group } } - -# Use this variable to reference the base path. Thus you are safe from any -# changes. -$module_dir_path = '/var/lib/puppet/modules' |