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, 15 insertions, 0 deletions

diff --git a/manifests/moduledir.pp b/manifests/moduledir.pp
new file mode 100644
index 0000000..df83e60
--- /dev/null
+++ b/manifests/moduledir.pp
@@ -0,0 +1,15 @@
+class common::moduledir {
+    # Use this variable to reference the base path. Thus you are safe from any
+    # changes.
+    $module_dir_path = '/var/lib/puppet/modules'
+
+    # Module programmers can use /var/lib/puppet/modules/$modulename to save
+    # module-local data, e.g. for constructing config files
+    file{$module_dir_path:
+        ensure => directory,
+        source => "puppet:///modules/common/modules/",
+        ignore => '.ignore',
+        recurse => true, purge => true, force => true,
+        mode => 0755, owner => root, group => 0;
+    }
+}