summaryrefslogtreecommitdiff
path: root/manifests
diff options
context:
space:
mode:
authorMicah Anderson <micah@riseup.net>2009-11-23 11:54:04 -0500
committerMicah Anderson <micah@riseup.net>2009-11-23 11:54:04 -0500
commit3ff12051c8efabcdfb43b99810ff1c2ea22750a3 (patch)
tree5145331d85099abd1e01dabca1a474b9651184f6 /manifests
parent8a389425075f54f8c10e2ff08c1aa07827d14622 (diff)
move plugin directory to fit new 0.25.x style and update file paths accordingly
Diffstat (limited to 'manifests')
-rw-r--r--manifests/defines/concatenated_file.pp2
-rw-r--r--manifests/defines/module_dir.pp2
-rw-r--r--manifests/init.pp2
3 files changed, 3 insertions, 3 deletions
diff --git a/manifests/defines/concatenated_file.pp b/manifests/defines/concatenated_file.pp
index 8ae855c..b85456c 100644
--- a/manifests/defines/concatenated_file.pp
+++ b/manifests/defines/concatenated_file.pp
@@ -51,7 +51,7 @@ define concatenated_file (
} else {
file {
$dir_real:
- source => "puppet:///common/empty",
+ source => "puppet://$server/modules/common/empty",
checksum => mtime,
ignore => '.ignore',
recurse => true, purge => true, force => true,
diff --git a/manifests/defines/module_dir.pp b/manifests/defines/module_dir.pp
index 5b2d340..def5c94 100644
--- a/manifests/defines/module_dir.pp
+++ b/manifests/defines/module_dir.pp
@@ -27,7 +27,7 @@ define module_dir (
} else {
file {
$dir:
- source => [ "puppet:///${name}/module_dir", "puppet:///common/empty"],
+ source => [ "puppet://$server/modules/${name}/module_dir", "puppet://$server/modules/common/empty"],
checksum => mtime,
# ignore the placeholder
ignore => '\.ignore',
diff --git a/manifests/init.pp b/manifests/init.pp
index f7298e3..f767030 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -13,7 +13,7 @@ file {
# for details
"/var/lib/puppet/modules":
ensure => directory,
- source => "puppet:///common/modules",
+ source => "puppet://$server/modules/common/modules",
ignore => ".ignore",
recurse => true, purge => true, force => true,
mode => 0755, owner => root, group => 0;