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_file.pp | 33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)
 create mode 100644 manifests/defines/module_file.pp

(limited to 'manifests/defines/module_file.pp')

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 }
+}
-- 
cgit v1.2.3


From ca9b0fecd989df4877163f718ada342d7ca8a26b Mon Sep 17 00:00:00 2001
From: Jerome Charaoui <jcharaoui@cmaisonneuve.qc.ca>
Date: Fri, 7 May 2010 17:38:15 -0400
Subject: fix whitespace (remove tabs & trailing whitespace)

---
 manifests/defines/module_file.pp | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

(limited to 'manifests/defines/module_file.pp')

diff --git a/manifests/defines/module_file.pp b/manifests/defines/module_file.pp
index 3c436ef..6f84a32 100644
--- a/manifests/defines/module_file.pp
+++ b/manifests/defines/module_file.pp
@@ -6,28 +6,28 @@
 
 # Usage:
 # modules_file { "module/file":
-# 	source => "puppet://${server}/...",
-# 	mode   => 644,   # default
-# 	owner  => root,  # default
-#		group  => 0,     # default
+#     source => "puppet://${server}/...",
+#     mode   => 644,   # default
+#     owner  => root,  # default
+#        group  => 0,     # default
 # }
 define module_file (
-		$source,
-		$mode = 0644, $owner = root, $group = 0
-	)
+        $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;
-	}
+    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
-	)
+        $source, $mode = 0644, $owner = root, $group = 0
+    )
 {
   module_file { $name: source => $source, mode => $mode, owner => $owner, group => $group }
 }
-- 
cgit v1.2.3


From d366f079d170004674481d25753aed362d4ef609 Mon Sep 17 00:00:00 2001
From: Jerome Charaoui <jcharaoui@cmaisonneuve.qc.ca>
Date: Fri, 7 May 2010 17:44:28 -0400
Subject: add esnure and alias paramaters to module_file

---
 manifests/defines/module_file.pp | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

(limited to 'manifests/defines/module_file.pp')

diff --git a/manifests/defines/module_file.pp b/manifests/defines/module_file.pp
index 6f84a32..e80c1ed 100644
--- a/manifests/defines/module_file.pp
+++ b/manifests/defines/module_file.pp
@@ -9,19 +9,26 @@
 #     source => "puppet://${server}/...",
 #     mode   => 644,   # default
 #     owner  => root,  # default
-#        group  => 0,     # default
+#     group  => 0,     # default
 # }
 define module_file (
-        $source,
-        $mode = 0644, $owner = root, $group = 0
+	$source,
+	$ensure = present,
+	$alias = 'absent',
+	$mode = 0644, $owner = root, $group = 0
     )
 {
     include common::moduledir
     file {
         "${common::moduledir::module_dir_path}/${name}":
             source => $source,
+            ensure => $ensure,
             mode => $mode, owner => $owner, group => $group;
     }
+    
+    if ($alias != 'absent') {
+    	File["${common::moduledir::module_dir_path}/${name}"] { alias => $alias }
+    }
 }
 
 # alias for compatibility
-- 
cgit v1.2.3


From e45a5794e7fc36d601ac047ef879f2b16f88a333 Mon Sep 17 00:00:00 2001
From: Jerome Charaoui <jcharaoui@cmaisonneuve.qc.ca>
Date: Mon, 10 May 2010 09:36:34 -0400
Subject: add ensure and alias parameters to modules_file compatiblity resource
 and use undef keywork for alias

---
 manifests/defines/module_file.pp | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

(limited to 'manifests/defines/module_file.pp')

diff --git a/manifests/defines/module_file.pp b/manifests/defines/module_file.pp
index e80c1ed..1b18c29 100644
--- a/manifests/defines/module_file.pp
+++ b/manifests/defines/module_file.pp
@@ -14,7 +14,7 @@
 define module_file (
 	$source,
 	$ensure = present,
-	$alias = 'absent',
+	$alias = undef,
 	$mode = 0644, $owner = root, $group = 0
     )
 {
@@ -23,18 +23,23 @@ define module_file (
         "${common::moduledir::module_dir_path}/${name}":
             source => $source,
             ensure => $ensure,
+            alias => $alias,
             mode => $mode, owner => $owner, group => $group;
     }
-    
-    if ($alias != 'absent') {
-    	File["${common::moduledir::module_dir_path}/${name}"] { alias => $alias }
-    }
 }
 
 # alias for compatibility
 define modules_file (
-        $source, $mode = 0644, $owner = root, $group = 0
-    )
+    $source,
+	  $ensure = present,
+	  $alias = undef,
+    $mode = 0644, $owner = root, $group = 0
+  )
 {
-  module_file { $name: source => $source, mode => $mode, owner => $owner, group => $group }
+  module_file { $name:
+      source => $source,
+      ensure => $ensure,
+      alias => $alias,
+      mode => $mode, owner => $owner, group => $group
+      }
 }
-- 
cgit v1.2.3


From 51e06fd0d2fa1c8999f328051e5e717bc18e77e7 Mon Sep 17 00:00:00 2001
From: mh <mh@immerda.ch>
Date: Wed, 11 Aug 2010 15:56:40 +0200
Subject: remove unnecessary fileserver variable (#2460) round II

---
 manifests/defines/module_file.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'manifests/defines/module_file.pp')

diff --git a/manifests/defines/module_file.pp b/manifests/defines/module_file.pp
index 1b18c29..43b3c48 100644
--- a/manifests/defines/module_file.pp
+++ b/manifests/defines/module_file.pp
@@ -6,7 +6,7 @@
 
 # Usage:
 # modules_file { "module/file":
-#     source => "puppet://${server}/...",
+#     source => "puppet:///...",
 #     mode   => 644,   # default
 #     owner  => root,  # default
 #     group  => 0,     # default
-- 
cgit v1.2.3