opuppet/module-common
4
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

refactor modules_dir and modules_file to remove plural (deprecated in David Schmitt's version) and adjust module_file to new module_dir structure

Browse source
This commit is contained in:
Jerome Charaoui 2010-05-07 17:13:48 -04:00 committed by Micah Anderson
parent 109311524e
commit 1379f6cba1
3 changed files with 38 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
manifests/defines/modules_dir.pp → manifests/defines/module_dir.pp
View file

@ -6,16 +6,16 @@
# Usage: # Usage:
# include common::moduledir # include common::moduledir
# modules_dir { ["common", "common/dir1", "common/dir2" ]: } # module_dir { ["common", "common/dir1", "common/dir2" ]: }
# #
# You may refer to a file in module_dir by using : # You may refer to a file in module_dir by using :
# file { "${common::moduledir::module_dir_path}/somedir/somefile": } # file { "${common::moduledir::module_dir_path}/somedir/somefile": }
define modules_dir ( define module_dir (
$mode = 0644, $owner = root, $group = 0 $mode = 0644, $owner = root, $group = 0
) )
{ {
include common::moduledir include common::moduledir
$dir = "$common::moduledir::module_dir_path/${name}" $dir = "$common::moduledir::module_dir_path/${name}"
if defined(File[$dir]) { if defined(File[$dir]) {
debug("${dir} already defined") debug("${dir} already defined")
@ -33,9 +33,9 @@ define modules_dir (
} }
# alias for compatibility # alias for compatibility
define module_dir ( define modules_dir (
$mode = 0644, $owner = root, $group = 0 $mode = 0644, $owner = root, $group = 0
) )
{ {
modules_dir{$name: mode => $mode, owner => $owner, group => $group } module_dir { $name: mode => $mode, owner => $owner, group => $group }
} }

33
manifests/defines/module_file.pp Normal file
View file

@ -0,0 +1,33 @@
# 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.
# Usage:
# modules_file { "module/file":
# source => "puppet://${server}/...",
# mode => 644, # default
# owner => root, # default
# group => 0, # default
# }
define module_file (
$source,
$mode = 0644, $owner = root, $group = 0
)
{
include common::moduledir
file {
"${common::moduledir::module_dir_path}/${name}":
source => $source,
mode => $mode, owner => $owner, group => $group;
}
}
# alias for compatibility
define modules_file (
$source, $mode = 0644, $owner = root, $group = 0
)
{
module_file { $name: source => $source, mode => $mode, owner => $owner, group => $group }
}

24
manifests/defines/modules_file.pp
View file

@ -1,24 +0,0 @@
# 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.
# Usage:
# modules_file { "module/file":
# source => "puppet://..",
# mode => 644, # default
# owner => root, # default
# group => root, # default
# }
define modules_file (
$source,
$mode = 0644, $owner = root, $group = root
)
{
file {
"/var/lib/puppet/modules/${name}":
source => $source,
mode => $mode, owner => $owner, group => $group;
}
}