From 3ff12051c8efabcdfb43b99810ff1c2ea22750a3 Mon Sep 17 00:00:00 2001 From: Micah Anderson Date: Mon, 23 Nov 2009 11:54:04 -0500 Subject: move plugin directory to fit new 0.25.x style and update file paths accordingly --- manifests/defines/concatenated_file.pp | 2 +- manifests/defines/module_dir.pp | 2 +- manifests/init.pp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'manifests') 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; -- cgit v1.2.3