diff options
| author | luke <luke@980ebf18-57e1-0310-9a29-db15c13687c0> | 2006-06-28 19:47:36 +0000 |
|---|---|---|
| committer | luke <luke@980ebf18-57e1-0310-9a29-db15c13687c0> | 2006-06-28 19:47:36 +0000 |
| commit | e8c57ae6decdd5409c102f23488a18022f80836d (patch) | |
| tree | ea02d9b8bd5144262704e9fb734d812e43754d50 /lib/puppet/client | |
| parent | d98ab112a6ed5cd84d4e8b2e9c349283923ecc29 (diff) | |
Cleaning up plugin handling a bit -- they can now be colon-separated paths, and I added a separate "plugindest" setting for determining where plugins are synchronized to. The major feature I added, though, is that Puppet::Type now knows how to load plugins, and treats :pluginpath as a search path for plugins.
git-svn-id: https://reductivelabs.com/svn/puppet/trunk@1330 980ebf18-57e1-0310-9a29-db15c13687c0
Diffstat (limited to 'lib/puppet/client')
| -rw-r--r-- | lib/puppet/client/master.rb | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/lib/puppet/client/master.rb b/lib/puppet/client/master.rb index 1abb6c0c6..3f54fa27f 100644 --- a/lib/puppet/client/master.rb +++ b/lib/puppet/client/master.rb @@ -22,7 +22,10 @@ class Puppet::Client::MasterClient < Puppet::Client Puppet.setdefaults("puppet", :pluginpath => ["$vardir/plugins", "Where Puppet should look for plugins. Multiple directories should - be comma-separated."], + be colon-separated, like normal PATH variables."], + :plugindest => ["$vardir/plugins", + "Where Puppet should store plugins that it pulls down from the central + server."], :pluginsource => ["puppet://puppet/plugins", "From where to retrieve plugins. The standard Puppet ``file`` type is used for retrieval, so anything that is a valid file source can @@ -439,7 +442,7 @@ class Puppet::Client::MasterClient < Puppet::Client :name => "plugin_collector" ) plugins.push Puppet::Type.type(:file).create( - :path => Puppet[:pluginpath], + :path => Puppet[:plugindest], :recurse => true, :source => Puppet[:pluginsource], :ignore => Puppet[:pluginsignore].split(/\s+/), |