recursivly updating file path to new 0.25 style

diff --git a/manifests/defines/concatenated_file.pp b/manifests/defines/concatenated_file.pp
index 5a5144e62cda729cb3078e479c81b4b4a70b0227..b6f8fb862b8de4dd087d5441339389f71c08a9be 100644 (file)
--- a/manifests/defines/concatenated_file.pp
+++ b/manifests/defines/concatenated_file.pp
@@ -30,7 +30,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/init.pp b/manifests/init.pp
index f01ba24e4bc3394dcf9135621d1d7ad8c81bc2aa..b0a8ab2d574a940aecb832d4157558e59201b0d7 100644 (file)
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -7,7 +7,7 @@ file {
        # module-local data, e.g. for constructing config files
        "/var/lib/puppet/modules":
                ensure => directory,
-               source => "puppet://$server/common/modules/",
+               source => "puppet://$server/modules/common/modules/",
                ignore => '\.ignore',
                recurse => true, purge => true, force => true,
                mode => 0755, owner => root, group => 0;