remove unnecessary fileserver variable (#2460)

diff --git a/manifests/defines/module_dir.pp b/manifests/defines/module_dir.pp
index 39fef8c1555a7389544bd4a69ae7594052608d80..613cc49fd2247c50b013583621c294b8f3e5efb0 100644 (file)
--- a/manifests/defines/module_dir.pp
+++ b/manifests/defines/module_dir.pp
@@ -22,7 +22,7 @@ define module_dir (
     } else {
         file {
             $dir:
-                source => [ "puppet://$server/modules/${name}/modules_dir", "puppet://$server/modules/common/empty"],
+                source => [ "puppet:///modules/${name}/modules_dir", "puppet:///modules/common/empty"],
                 checksum => mtime,
                 # ignore the placeholder
                 ignore => '.ignore',

diff --git a/manifests/moduledir.pp b/manifests/moduledir.pp
index 607d6f5bfe4d4030a4c380ff5a9594c24629f286..df83e608deb943ce82e727978d7c9fd351ed923b 100644 (file)
--- a/manifests/moduledir.pp
+++ b/manifests/moduledir.pp
@@ -7,7 +7,7 @@ class common::moduledir {
     # module-local data, e.g. for constructing config files
     file{$module_dir_path:
         ensure => directory,
-        source => "puppet://$server/modules/common/modules/",
+        source => "puppet:///modules/common/modules/",
         ignore => '.ignore',
         recurse => true, purge => true, force => true,
         mode => 0755, owner => root, group => 0;