diff options
| author | Micah Anderson <micah@riseup.net> | 2010-09-02 19:04:29 -0400 |
|---|---|---|
| committer | Micah Anderson <micah@riseup.net> | 2010-09-02 19:04:29 -0400 |
| commit | 63a16ad8c07e880e68cb7c0a895f7e26ca1434f8 (patch) | |
| tree | 1ca7da340aef82e8fe87f44c680cedc93795ecbf /manifests/defines/module_file.pp | |
| parent | 76b0a31a76b8ab7509da3389379daa24b0610f73 (diff) | |
| parent | 51e06fd0d2fa1c8999f328051e5e717bc18e77e7 (diff) | |
Merge remote branch 'immerda/master'
Conflicts:
lib/puppet/parser/functions/gsub.rb
lib/puppet/parser/functions/prefix_with.rb
lib/puppet/parser/functions/sha1.rb
lib/puppet/parser/functions/slash_escape.rb
lib/puppet/parser/functions/substitute.rb
manifests/classes/lsb_release.pp
manifests/defines/concatenated_file.pp
manifests/defines/config_file.pp
manifests/defines/line.pp
manifests/defines/module_dir.pp
manifests/defines/module_file.pp
manifests/defines/replace.pp
manifests/init.pp
Diffstat (limited to 'manifests/defines/module_file.pp')
| -rw-r--r-- | manifests/defines/module_file.pp | 49 |
1 files changed, 36 insertions, 13 deletions
diff --git a/manifests/defines/module_file.pp b/manifests/defines/module_file.pp index 9074589..70e5cbf 100644 --- a/manifests/defines/module_file.pp +++ b/manifests/defines/module_file.pp @@ -1,5 +1,5 @@ -# common/manifests/defines/module_file.pp -- use an already defined module_dir -# to store module specific files +# common/manifests/defines/modules_file.pp -- use a modules_dir to store module +# specific files # # Copyright (C) 2007 David Schmitt <david@schmitt.edv-bus.at> # See LICENSE for the full license granted to you. @@ -7,18 +7,41 @@ # Put a file into module-local storage. # # Usage: -# module_file { -# "module/file": -# source => "puppet://..", +# modules_file { "module/file": +# source => "puppet:///...", +# mode => 644, # default +# owner => root, # default +# group => 0, # default # } define module_file ( - $source, - $mode = 0644, $owner = root, $group = 0 - ) + $source, + $ensure = present, + $alias = undef, + $mode = 0644, $owner = root, $group = 0 + ) { - file { - "${module_dir_path}/${name}": - source => $source, - mode => $mode, owner => $owner, group => $group; - } + include common::moduledir + file { + "${common::moduledir::module_dir_path}/${name}": + source => $source, + ensure => $ensure, + alias => $alias, + mode => $mode, owner => $owner, group => $group; + } +} + +# alias for compatibility +define modules_file ( + $source, + $ensure = present, + $alias = undef, + $mode = 0644, $owner = root, $group = 0 + ) +{ + module_file { $name: + source => $source, + ensure => $ensure, + alias => $alias, + mode => $mode, owner => $owner, group => $group + } } |