Merge git://labs.riseup.net/module_common
authorSilvio Rhatto <rhatto@riseup.net>
Sun, 6 Dec 2009 19:18:24 +0000 (17:18 -0200)
committerSilvio Rhatto <rhatto@riseup.net>
Sun, 6 Dec 2009 19:18:24 +0000 (17:18 -0200)
lib/puppet/parser/functions/basename.rb [moved from plugins/puppet/parser/functions/basename.rb with 100% similarity]
lib/puppet/parser/functions/dirname.rb [moved from plugins/puppet/parser/functions/dirname.rb with 100% similarity]
lib/puppet/parser/functions/gsub.rb [moved from plugins/puppet/parser/functions/gsub.rb with 100% similarity]
lib/puppet/parser/functions/prefix_with.rb [moved from plugins/puppet/parser/functions/prefix_with.rb with 100% similarity]
lib/puppet/parser/functions/re_escape.rb [moved from plugins/puppet/parser/functions/re_escape.rb with 100% similarity]
lib/puppet/parser/functions/split.rb [moved from plugins/puppet/parser/functions/split.rb with 100% similarity]
manifests/defines/concatenated_file.pp
manifests/defines/config_file.pp
manifests/defines/line.pp
manifests/defines/module_dir.pp
manifests/init.pp

index 8ae855c..b85456c 100644 (file)
@@ -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,
index 59208ac..781e9ec 100644 (file)
@@ -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
index 534fd7c..832382f 100644 (file)
 # 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
index 5b2d340..def5c94 100644 (file)
@@ -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', 
index f7298e3..f767030 100644 (file)
@@ -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;