From 1379f6cba15c3e76ade83e5ec4b997879d4370e7 Mon Sep 17 00:00:00 2001
From: Jerome Charaoui <jcharaoui@cmaisonneuve.qc.ca>
Date: Fri, 7 May 2010 17:13:48 -0400
Subject: refactor modules_dir and modules_file to remove plural (deprecated in
 David Schmitt's version) and adjust module_file to new module_dir structure

---
 manifests/defines/module_dir.pp   | 41 +++++++++++++++++++++++++++++++++++++++
 manifests/defines/module_file.pp  | 33 +++++++++++++++++++++++++++++++
 manifests/defines/modules_dir.pp  | 41 ---------------------------------------
 manifests/defines/modules_file.pp | 24 -----------------------
 4 files changed, 74 insertions(+), 65 deletions(-)
 create mode 100644 manifests/defines/module_dir.pp
 create mode 100644 manifests/defines/module_file.pp
 delete mode 100644 manifests/defines/modules_dir.pp
 delete mode 100644 manifests/defines/modules_file.pp

(limited to 'manifests')

diff --git a/manifests/defines/module_dir.pp b/manifests/defines/module_dir.pp
new file mode 100644
index 0000000..73f5d75
--- /dev/null
+++ b/manifests/defines/module_dir.pp
@@ -0,0 +1,41 @@
+# 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.
+
+# Usage:
+# 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
+	)
+{
+	include common::moduledir
+	$dir = "$common::moduledir::module_dir_path/${name}"
+	if defined(File[$dir]) {
+		debug("${dir} already defined")
+	} else {
+		file {
+			$dir:
+				source => [ "puppet://$server/modules/${name}/modules_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;
+		}
+	}
+}
+
+# alias for compatibility
+define modules_dir (
+		$mode = 0644, $owner = root, $group = 0
+	)
+{
+  module_dir { $name: mode => $mode, owner => $owner, group => $group }
+}
diff --git a/manifests/defines/module_file.pp b/manifests/defines/module_file.pp
new file mode 100644
index 0000000..3c436ef
--- /dev/null
+++ b/manifests/defines/module_file.pp
@@ -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 }
+}
diff --git a/manifests/defines/modules_dir.pp b/manifests/defines/modules_dir.pp
deleted file mode 100644
index 02398ea..0000000
--- a/manifests/defines/modules_dir.pp
+++ /dev/null
@@ -1,41 +0,0 @@
-# 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.
-
-# Usage:
-# include common::moduledir
-# modules_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 modules_dir (
-		$mode = 0644, $owner = root, $group = 0
-	)
-{
-  include common::moduledir
-	$dir = "$common::moduledir::module_dir_path/${name}"
-	if defined(File[$dir]) {
-		debug("${dir} already defined")
-	} else {
-		file {
-			$dir:
-				source => [ "puppet://$server/modules/${name}/modules_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;
-		}
-	}
-}
-
-# alias for compatibility
-define module_dir (
-		$mode = 0644, $owner = root, $group = 0
-	)
-{
-  modules_dir{$name: mode => $mode, owner => $owner, group => $group }
-}
diff --git a/manifests/defines/modules_file.pp b/manifests/defines/modules_file.pp
deleted file mode 100644
index 6a37242..0000000
--- a/manifests/defines/modules_file.pp
+++ /dev/null
@@ -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;
-	}
-}
-- 
cgit v1.2.3