aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2011-03-24 15:19:05 -0300
committerSilvio Rhatto <rhatto@riseup.net>2011-03-24 15:19:05 -0300
commitf3cf4d3642b5967d6677a4d67a0b28a4c4f8babb (patch)
treef446f85a5250e9b8c990ebe575f198ef6afe278e
parenta15e2be608ddb01ea8b7720a95d1886267bc6975 (diff)
parent3ac7106d38966452757d10dcff0f84c6e0a90409 (diff)
downloadpuppet-common-f3cf4d3642b5967d6677a4d67a0b28a4c4f8babb.tar.gz
puppet-common-f3cf4d3642b5967d6677a4d67a0b28a4c4f8babb.tar.bz2
Merge branch 'master' of git://git.mayfirst.org/mfpl/puppet-modules/common into mayfirst
-rw-r--r--manifests/defines/module_file.pp8
1 files changed, 4 insertions, 4 deletions
diff --git a/manifests/defines/module_file.pp b/manifests/defines/module_file.pp
index 43b3c48..44f3968 100644
--- a/manifests/defines/module_file.pp
+++ b/manifests/defines/module_file.pp
@@ -14,7 +14,7 @@
define module_file (
$source,
$ensure = present,
- $alias = undef,
+ $m_alias = undef,
$mode = 0644, $owner = root, $group = 0
)
{
@@ -23,7 +23,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;
}
}
@@ -32,14 +32,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
}
}