do not use $servername in puppet:// urls

Instead, use puppet:///, which automatically uses
$servername when executed on clients, but which also works
when run locally.

Signed-off-by: martin f. krafft <madduck@madduck.net>
Signed-off-by: David Schmitt <david@schmitt.edv-bus.at>

diff --git a/manifests/defines/concatenated_file.pp b/manifests/defines/concatenated_file.pp
index c35449b92f395d5e68cd5c363a5dd3fce32073a4..f6404f29fe1e358c3556561635510d743aaee779 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://$servername/common/empty",
+                               source => "puppet:///common/empty",
                                checksum => mtime,
                                recurse => true, purge => true, force => true,
                                mode => $mode, owner => $owner, group => $group,

diff --git a/manifests/defines/modules_dir.pp b/manifests/defines/modules_dir.pp
index 271b2749d19eb7bac37dfa457c337c7712981fad..a8b928cac022b2209300e1adb82a41a038d320df 100644 (file)
--- a/manifests/defines/modules_dir.pp
+++ b/manifests/defines/modules_dir.pp
@@ -16,7 +16,7 @@ define modules_dir (
        } else {
                file {
                        "/var/lib/puppet/modules/${name}":
-                               source => [ "puppet://$servername/${name}/modules_dir", "puppet://$servername/common/empty"],
+                               source => [ "puppet:///${name}/modules_dir", "puppet://$servername/common/empty"],
                                checksum => mtime,
                                recurse => true, purge => true, force => true,
                                mode => $mode, owner => $owner, group => $group;

diff --git a/manifests/init.pp b/manifests/init.pp
index d2847823e0032c0c86374eeace312e27ec3d2908..dac565227108b03b750c0bf817aeb02d5864d46d 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://$servername/common/modules/",
+               source => "puppet:///common/modules/",
                ignore => ".svn",
                recurse => true, purge => true, force => true,
                mode => 0755, owner => root, group => 0;