Merge git://labs.riseup.net/module_common

11 files changed, 9 insertions, 11 deletions

diff --git a/plugins/puppet/parser/functions/basename.rb b/lib/puppet/parser/functions/basename.rb
index dc72537..dc72537 100644
--- a/plugins/puppet/parser/functions/basename.rb
+++ b/lib/puppet/parser/functions/basename.rb
diff --git a/plugins/puppet/parser/functions/dirname.rb b/lib/puppet/parser/functions/dirname.rb
index ea0d50b..ea0d50b 100644
--- a/plugins/puppet/parser/functions/dirname.rb
+++ b/lib/puppet/parser/functions/dirname.rb
diff --git a/plugins/puppet/parser/functions/gsub.rb b/lib/puppet/parser/functions/gsub.rb
index 27e6192..27e6192 100644
--- a/plugins/puppet/parser/functions/gsub.rb
+++ b/lib/puppet/parser/functions/gsub.rb
diff --git a/plugins/puppet/parser/functions/prefix_with.rb b/lib/puppet/parser/functions/prefix_with.rb
index 5a12986..5a12986 100644
--- a/plugins/puppet/parser/functions/prefix_with.rb
+++ b/lib/puppet/parser/functions/prefix_with.rb
diff --git a/plugins/puppet/parser/functions/re_escape.rb b/lib/puppet/parser/functions/re_escape.rb
index 7bee90a..7bee90a 100644
--- a/plugins/puppet/parser/functions/re_escape.rb
+++ b/lib/puppet/parser/functions/re_escape.rb
diff --git a/plugins/puppet/parser/functions/split.rb b/lib/puppet/parser/functions/split.rb
index bffecc1..bffecc1 100644
--- a/plugins/puppet/parser/functions/split.rb
+++ b/lib/puppet/parser/functions/split.rb
diff --git a/manifests/defines/concatenated_file.pp b/manifests/defines/concatenated_file.pp
index 8ae855c..b85456c 100644
--- a/manifests/defines/concatenated_file.pp
+++ b/manifests/defines/concatenated_file.pp
@@ -51,7 +51,7 @@ define concatenated_file (
 	} else {
 		file {
 			$dir_real:
-				source => "puppet:///common/empty",
+				source => "puppet://$server/modules/common/empty",
 				checksum => mtime,
 				ignore => '.ignore',
 				recurse => true, purge => true, force => true,
diff --git a/manifests/defines/config_file.pp b/manifests/defines/config_file.pp
index 59208ac..781e9ec 100644
--- a/manifests/defines/config_file.pp
+++ b/manifests/defines/config_file.pp
@@ -37,8 +37,6 @@ define config_file (
 {
 	file { $name:
 		ensure => $ensure,
-		# keep old versions on the server
-		backup => server,
 		# default permissions for config files
 		mode => 0644, owner => root, group => 0,
 		# really detect changes to this file
diff --git a/manifests/defines/line.pp b/manifests/defines/line.pp
index 534fd7c..832382f 100644
--- a/manifests/defines/line.pp
+++ b/manifests/defines/line.pp
@@ -14,12 +14,12 @@
 # is a more stable solution with less maintenance headaches afterwards.
 #
 # Usage:
-#  line {
-#  	description:
-# 			file => "filename",
-#  		line => "content",
-# 			ensure => {absent,*present*}
-#  }
+# line {
+#   description:
+#     file => "filename",
+#     line => "content",
+#     ensure => {absent,*present*}
+# }
 #
 # Example:
 # The following ensures that the line "allow ^$munin_host$" exists in
diff --git a/manifests/defines/module_dir.pp b/manifests/defines/module_dir.pp
index 5b2d340..def5c94 100644
--- a/manifests/defines/module_dir.pp
+++ b/manifests/defines/module_dir.pp
@@ -27,7 +27,7 @@ define module_dir (
 	} else {
 		file {
 			$dir:
-				source => [ "puppet:///${name}/module_dir", "puppet:///common/empty"],
+				source => [ "puppet://$server/modules/${name}/module_dir", "puppet://$server/modules/common/empty"],
 				checksum => mtime,
 				# ignore the placeholder
 				ignore => '\.ignore', 
diff --git a/manifests/init.pp b/manifests/init.pp
index f7298e3..f767030 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -13,7 +13,7 @@ file {
 		 # for details
        "/var/lib/puppet/modules":
                ensure => directory,
-               source => "puppet:///common/modules",
+               source => "puppet://$server/modules/common/modules",
                ignore => ".ignore",
                recurse => true, purge => true, force => true,
                mode => 0755, owner => root, group => 0;