diff options
| author | Micah Anderson <micah@riseup.net> | 2009-11-23 11:54:04 -0500 |
|---|---|---|
| committer | Micah Anderson <micah@riseup.net> | 2009-11-23 11:54:04 -0500 |
| commit | 3ff12051c8efabcdfb43b99810ff1c2ea22750a3 (patch) | |
| tree | 5145331d85099abd1e01dabca1a474b9651184f6 | |
| parent | 8a389425075f54f8c10e2ff08c1aa07827d14622 (diff) | |
| download | puppet-common-3ff12051c8efabcdfb43b99810ff1c2ea22750a3.tar.gz puppet-common-3ff12051c8efabcdfb43b99810ff1c2ea22750a3.tar.bz2 | |
move plugin directory to fit new 0.25.x style and update file paths accordingly
| -rw-r--r-- | lib/puppet/parser/functions/basename.rb (renamed from plugins/puppet/parser/functions/basename.rb) | 0 | ||||
| -rw-r--r-- | lib/puppet/parser/functions/dirname.rb (renamed from plugins/puppet/parser/functions/dirname.rb) | 0 | ||||
| -rw-r--r-- | lib/puppet/parser/functions/gsub.rb (renamed from plugins/puppet/parser/functions/gsub.rb) | 0 | ||||
| -rw-r--r-- | lib/puppet/parser/functions/prefix_with.rb (renamed from plugins/puppet/parser/functions/prefix_with.rb) | 0 | ||||
| -rw-r--r-- | lib/puppet/parser/functions/re_escape.rb (renamed from plugins/puppet/parser/functions/re_escape.rb) | 0 | ||||
| -rw-r--r-- | lib/puppet/parser/functions/split.rb (renamed from plugins/puppet/parser/functions/split.rb) | 0 | ||||
| -rw-r--r-- | manifests/defines/concatenated_file.pp | 2 | ||||
| -rw-r--r-- | manifests/defines/module_dir.pp | 2 | ||||
| -rw-r--r-- | manifests/init.pp | 2 |
9 files changed, 3 insertions, 3 deletions
diff --git a/plugins/puppet/parser/functions/basename.rb b/lib/puppet/parser/functions/basename.rb index dc72537..dc72537 100644 --- a/plugins/puppet/parser/functions/basename.rb +++ b/lib/puppet/parser/functions/basename.rb diff --git a/plugins/puppet/parser/functions/dirname.rb b/lib/puppet/parser/functions/dirname.rb index ea0d50b..ea0d50b 100644 --- a/plugins/puppet/parser/functions/dirname.rb +++ b/lib/puppet/parser/functions/dirname.rb diff --git a/plugins/puppet/parser/functions/gsub.rb b/lib/puppet/parser/functions/gsub.rb index 27e6192..27e6192 100644 --- a/plugins/puppet/parser/functions/gsub.rb +++ b/lib/puppet/parser/functions/gsub.rb diff --git a/plugins/puppet/parser/functions/prefix_with.rb b/lib/puppet/parser/functions/prefix_with.rb index 5a12986..5a12986 100644 --- a/plugins/puppet/parser/functions/prefix_with.rb +++ b/lib/puppet/parser/functions/prefix_with.rb diff --git a/plugins/puppet/parser/functions/re_escape.rb b/lib/puppet/parser/functions/re_escape.rb index 7bee90a..7bee90a 100644 --- a/plugins/puppet/parser/functions/re_escape.rb +++ b/lib/puppet/parser/functions/re_escape.rb diff --git a/plugins/puppet/parser/functions/split.rb b/lib/puppet/parser/functions/split.rb index bffecc1..bffecc1 100644 --- a/plugins/puppet/parser/functions/split.rb +++ b/lib/puppet/parser/functions/split.rb 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; |