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/modules_dir.pp | |
| parent | fcb2b08309e7ad18ee58283d754cb41b54fd79d1 (diff) | |
refactoring the last part of moduledirs
Diffstat (limited to 'manifests/defines/modules_dir.pp')
| -rw-r--r-- | manifests/defines/modules_dir.pp | 9 |
1 files changed, 3 insertions, 6 deletions
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' |