diff options
| author | Marcel Haerry <haerry@puzzle.ch> | 2010-05-05 17:26:43 +0200 |
|---|---|---|
| committer | Micah Anderson <micah@riseup.net> | 2010-09-02 18:17:35 -0400 |
| commit | f3dde9f52a2d46f6ca949b87c3d6b15b90b4f6e4 (patch) | |
| tree | 4866a67593a21688c661c7f022a69c033a37b30e /manifests/defines/concatenated_file.pp | |
| parent | fcb2b08309e7ad18ee58283d754cb41b54fd79d1 (diff) | |
refactoring the last part of moduledirs
Diffstat (limited to 'manifests/defines/concatenated_file.pp')
| -rw-r--r-- | manifests/defines/concatenated_file.pp | 5 |
1 files changed, 2 insertions, 3 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") |