move plugin directory to fit new 0.25.x style and update file paths accordingly

diff --git a/plugins/puppet/parser/functions/basename.rb b/lib/puppet/parser/functions/basename.rb
similarity index 100%
rename from plugins/puppet/parser/functions/basename.rb
rename to lib/puppet/parser/functions/basename.rb

diff --git a/plugins/puppet/parser/functions/dirname.rb b/lib/puppet/parser/functions/dirname.rb
similarity index 100%
rename from plugins/puppet/parser/functions/dirname.rb
rename to lib/puppet/parser/functions/dirname.rb

diff --git a/plugins/puppet/parser/functions/gsub.rb b/lib/puppet/parser/functions/gsub.rb
similarity index 100%
rename from plugins/puppet/parser/functions/gsub.rb
rename to lib/puppet/parser/functions/gsub.rb

diff --git a/plugins/puppet/parser/functions/prefix_with.rb b/lib/puppet/parser/functions/prefix_with.rb
similarity index 100%
rename from plugins/puppet/parser/functions/prefix_with.rb
rename to 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
similarity index 100%
rename from plugins/puppet/parser/functions/re_escape.rb
rename to lib/puppet/parser/functions/re_escape.rb

diff --git a/plugins/puppet/parser/functions/split.rb b/lib/puppet/parser/functions/split.rb
similarity index 100%
rename from plugins/puppet/parser/functions/split.rb
rename to lib/puppet/parser/functions/split.rb

diff --git a/manifests/defines/concatenated_file.pp b/manifests/defines/concatenated_file.pp
index 8ae855c8a81897e3100c63a76cbdbb99ab917d5e..b85456c908575eca48be11615dd85e0733fdda6f 100644 (file)
--- 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/module_dir.pp b/manifests/defines/module_dir.pp
index 5b2d340b7e96e1e1607e5b421b5b6904a8310e8b..def5c945bd59749734f33202c20f13dc5b38074a 100644 (file)
--- 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 f7298e345d6c75ee1368053b3e91f2f37ff7ab7b..f7670305abeee6b8877fdcfd4e22e5882cfe5a61 100644 (file)
--- 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;