aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormh <mh@immerda.ch>2010-08-07 02:12:13 +0200
committerMicah Anderson <micah@riseup.net>2010-09-02 18:29:17 -0400
commit836316955a468d419416b9c28ebcc76dc577f199 (patch)
tree3df5d36c2690ea4bca741f07c1721af4c3dc35fb
parente5de903a2200cad66e7145c90f1c5ed6c2c88a4e (diff)
downloadpuppet-common-836316955a468d419416b9c28ebcc76dc577f199.tar.gz
puppet-common-836316955a468d419416b9c28ebcc76dc577f199.tar.bz2
remove unnecessary fileserver variable (#2460)
-rw-r--r--manifests/defines/module_dir.pp2
-rw-r--r--manifests/moduledir.pp2
2 files changed, 2 insertions, 2 deletions
diff --git a/manifests/defines/module_dir.pp b/manifests/defines/module_dir.pp
index 39fef8c..613cc49 100644
--- 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 607d6f5..df83e60 100644
--- 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;