Merge branch 'master' of git://git.mayfirst.org/mfpl/puppet-modules/common into mayfirst
This commit is contained in:
commit
f3cf4d3642
1 changed files with 4 additions and 4 deletions
|
@ -14,7 +14,7 @@
|
||||||
define module_file (
|
define module_file (
|
||||||
$source,
|
$source,
|
||||||
$ensure = present,
|
$ensure = present,
|
||||||
$alias = undef,
|
$m_alias = undef,
|
||||||
$mode = 0644, $owner = root, $group = 0
|
$mode = 0644, $owner = root, $group = 0
|
||||||
)
|
)
|
||||||
{
|
{
|
||||||
|
@ -23,7 +23,7 @@ define module_file (
|
||||||
"${common::moduledir::module_dir_path}/${name}":
|
"${common::moduledir::module_dir_path}/${name}":
|
||||||
source => $source,
|
source => $source,
|
||||||
ensure => $ensure,
|
ensure => $ensure,
|
||||||
alias => $alias,
|
alias => $m_alias,
|
||||||
mode => $mode, owner => $owner, group => $group;
|
mode => $mode, owner => $owner, group => $group;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -32,14 +32,14 @@ define module_file (
|
||||||
define modules_file (
|
define modules_file (
|
||||||
$source,
|
$source,
|
||||||
$ensure = present,
|
$ensure = present,
|
||||||
$alias = undef,
|
$m_alias = undef,
|
||||||
$mode = 0644, $owner = root, $group = 0
|
$mode = 0644, $owner = root, $group = 0
|
||||||
)
|
)
|
||||||
{
|
{
|
||||||
module_file { $name:
|
module_file { $name:
|
||||||
source => $source,
|
source => $source,
|
||||||
ensure => $ensure,
|
ensure => $ensure,
|
||||||
alias => $alias,
|
alias => $m_alias,
|
||||||
mode => $mode, owner => $owner, group => $group
|
mode => $mode, owner => $owner, group => $group
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue