diff options
| author | Micah Anderson <micah@riseup.net> | 2011-03-25 00:59:48 -0400 |
|---|---|---|
| committer | Micah Anderson <micah@riseup.net> | 2011-03-25 00:59:48 -0400 |
| commit | 233229435f4dacc5c1f14e1756b0d5810448f00c (patch) | |
| tree | 142bda5632e2f0084cb64f8f8c5ab130623e5870 /manifests/defines/module_file.pp | |
| parent | ab9bc25704ac0c560cc8f11ae6ef67402cde3830 (diff) | |
| parent | 46baf4a692932482cac32eff91d49de461411bac (diff) | |
| download | puppet-common-233229435f4dacc5c1f14e1756b0d5810448f00c.tar.gz puppet-common-233229435f4dacc5c1f14e1756b0d5810448f00c.tar.bz2 | |
Merge remote-tracking branch 'sarava/master'
Conflicts:
manifests/defines/line.pp
manifests/defines/module_dir.pp
manifests/defines/module_file.pp
manifests/init.pp
Diffstat (limited to 'manifests/defines/module_file.pp')
| -rw-r--r-- | manifests/defines/module_file.pp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/manifests/defines/module_file.pp b/manifests/defines/module_file.pp index 70e5cbf..5977b2d 100644 --- a/manifests/defines/module_file.pp +++ b/manifests/defines/module_file.pp @@ -16,7 +16,7 @@ define module_file ( $source, $ensure = present, - $alias = undef, + $m_alias = undef, $mode = 0644, $owner = root, $group = 0 ) { @@ -25,7 +25,7 @@ define module_file ( "${common::moduledir::module_dir_path}/${name}": source => $source, ensure => $ensure, - alias => $alias, + alias => $m_alias, mode => $mode, owner => $owner, group => $group; } } @@ -34,14 +34,14 @@ define module_file ( define modules_file ( $source, $ensure = present, - $alias = undef, + $m_alias = undef, $mode = 0644, $owner = root, $group = 0 ) { module_file { $name: source => $source, ensure => $ensure, - alias => $alias, + alias => $m_alias, mode => $mode, owner => $owner, group => $group } } |