Merge branch 'master' of git://labs.riseup.net/shared-common

Conflicts:
	lib/puppet/parser/functions/gsub.rb
	lib/puppet/parser/functions/prefix_with.rb
	lib/puppet/parser/functions/slash_escape.rb
	lib/puppet/parser/functions/split.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

1 files changed, 31 insertions, 32 deletions

diff --git a/manifests/defines/module_dir.pp b/manifests/defines/module_dir.pp
index def5c94..613cc49 100644
--- a/manifests/defines/module_dir.pp
+++ b/manifests/defines/module_dir.pp
@@ -1,42 +1,41 @@
-# common/manifests/defines/module_dir.pp -- create a default directory
+# common/manifests/defines/modules_dir.pp -- create a default directory
 # for storing module specific information
 #
 # Copyright (C) 2007 David Schmitt <david@schmitt.edv-bus.at>
 # See LICENSE for the full license granted to you.
 
-# A module_dir is a storage place for all the stuff a module might want to
-# store. According to the FHS, this should go to /var/lib. Since this is a part
-# of puppet, the full path is /var/lib/puppet/modules/${name}. Every module
-# should # prefix its module_dirs with its name.
-# 
-# By default, the module_dir is loaded from "puppet:///${name}/module_dir". If
-# that doesn't exist an empty directory is taken as source. The directory is
-# purged so that modules do not have to worry about removing cruft.
-# 
 # Usage:
-#  module_dir { ["common", "common/dir1", "common/dir2" ]: }
+# include common::moduledir
+# module_dir { ["common", "common/dir1", "common/dir2" ]: }
+#
+# You may refer to a file in module_dir by using :
+# file { "${common::moduledir::module_dir_path}/somedir/somefile": }
+
 define module_dir (
-		$mode = 0644,
-		$owner = root,
-		$group = 0
-	)
+        $mode = 0644, $owner = root, $group = 0
+    )
 {
-	$dir = "${module_dir_path}/${name}"
-	if defined(File[$dir]) {
-		debug("${dir} already defined")
-	} else {
-		file {
-			$dir:
-				source => [ "puppet://$server/modules/${name}/module_dir", "puppet://$server/modules/common/empty"],
-				checksum => mtime,
-				# ignore the placeholder
-				ignore => '\.ignore', 
-				recurse => true, purge => true, force => true,
-				mode => $mode, owner => $owner, group => $group;
-		}
-	}
+    include common::moduledir
+    $dir = "${common::moduledir::module_dir_path}/${name}"
+    if defined(File[$dir]) {
+        debug("${dir} already defined")
+    } else {
+        file {
+            $dir:
+                source => [ "puppet:///modules/${name}/modules_dir", "puppet:///modules/common/empty"],
+                checksum => mtime,
+                # ignore the placeholder
+                ignore => '.ignore',
+                recurse => true, purge => true, force => true,
+                mode => $mode, owner => $owner, group => $group;
+        }
+    }
 }
 
-# Use this variable to reference the base path. Thus you are safe from any
-# changes.
-$module_dir_path = '/var/lib/puppet/modules'
+# alias for compatibility
+define modules_dir (
+        $mode = 0644, $owner = root, $group = 0
+    )
+{
+  module_dir { $name: mode => $mode, owner => $owner, group => $group }
+}