diff options
| author | root <root@puppetmaster.black.co.at> | 2007-09-26 11:57:18 +0200 |
|---|---|---|
| committer | root <root@puppetmaster.black.co.at> | 2007-09-26 11:57:18 +0200 |
| commit | 32b0c131acca2640ace7ff6c714409b25d4b7742 (patch) | |
| tree | 12915eb6d31c7da40970e46d4d75b0b4a991fdd1 /manifests/defines/modules_dir.pp | |
| parent | 67ea4bb276d3103330b1f9e1668bd0db749f4313 (diff) | |
| download | puppet-common-32b0c131acca2640ace7ff6c714409b25d4b7742.tar.gz puppet-common-32b0c131acca2640ace7ff6c714409b25d4b7742.tar.bz2 | |
common: fix clash between modules_dir and concatenated_file(dir) better
Diffstat (limited to 'manifests/defines/modules_dir.pp')
| -rw-r--r-- | manifests/defines/modules_dir.pp | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/manifests/defines/modules_dir.pp b/manifests/defines/modules_dir.pp index 7f59c60..ae6bf38 100644 --- a/manifests/defines/modules_dir.pp +++ b/manifests/defines/modules_dir.pp @@ -10,11 +10,16 @@ define modules_dir ( $mode = 0755, $owner = root, $group = root ) { - file { - "/var/lib/puppet/modules/${name}": - source => [ "puppet://$servername/${name}/modules_dir", "puppet://$servername/common/empty"], - checksum => mtime, - recurse => true, purge => true, force => true, - mode => $mode, owner => $owner, group => $group; + $dir = "/var/lib/puppet/modules/${name}" + if defined(File[$dir]) { + debug("${dir} already defined") + } else { + file { + "/var/lib/puppet/modules/${name}": + source => [ "puppet://$servername/${name}/modules_dir", "puppet://$servername/common/empty"], + checksum => mtime, + recurse => true, purge => true, force => true, + mode => $mode, owner => $owner, group => $group; + } } } |