diff options
author | martin f. krafft <madduck@madduck.net> | 2008-06-05 16:05:12 +0200 |
---|---|---|
committer | David Schmitt <david@schmitt.edv-bus.at> | 2008-06-05 16:43:27 +0200 |
commit | 6a15374c1750953856774017cfd75814778b9db8 (patch) | |
tree | 2dfbfb72b9d97154564e472328c18a01eb19daf8 /manifests/defines | |
parent | 0da171820dd6f9dee2e5bb1d37d464fa26126c6b (diff) | |
download | puppet-common-6a15374c1750953856774017cfd75814778b9db8.tar.gz puppet-common-6a15374c1750953856774017cfd75814778b9db8.tar.bz2 |
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>
Diffstat (limited to 'manifests/defines')
-rw-r--r-- | manifests/defines/concatenated_file.pp | 2 | ||||
-rw-r--r-- | manifests/defines/modules_dir.pp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/manifests/defines/concatenated_file.pp b/manifests/defines/concatenated_file.pp index c35449b..f6404f2 100644 --- 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 271b274..a8b928c 100644 --- 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; |