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 | |
| parent | 0da171820dd6f9dee2e5bb1d37d464fa26126c6b (diff) | |
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')
| -rw-r--r-- | manifests/defines/concatenated_file.pp | 2 | ||||
| -rw-r--r-- | manifests/defines/modules_dir.pp | 2 | ||||
| -rw-r--r-- | manifests/init.pp | 2 |
3 files changed, 3 insertions, 3 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; diff --git a/manifests/init.pp b/manifests/init.pp index d284782..dac5652 100644 --- 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; |