summaryrefslogtreecommitdiffstats
path: root/lib/puppet/configuration.rb
diff options
context:
space:
mode:
authorlutter <lutter@980ebf18-57e1-0310-9a29-db15c13687c0>2007-03-09 00:47:27 +0000
committerlutter <lutter@980ebf18-57e1-0310-9a29-db15c13687c0>2007-03-09 00:47:27 +0000
commitba6257c02ef5e4bd32d58d40087f84dda95141c3 (patch)
treeb5f4556465f7b48a2cf0858dc3c3510cf9943a33 /lib/puppet/configuration.rb
parent10d68915c513ca9aa69862d17111acbf9ff87164 (diff)
downloadpuppet-ba6257c02ef5e4bd32d58d40087f84dda95141c3.tar.gz
puppet-ba6257c02ef5e4bd32d58d40087f84dda95141c3.tar.xz
puppet-ba6257c02ef5e4bd32d58d40087f84dda95141c3.zip
The basic plumbing for modules: a modulepath config parameter, and a new
class Puppet::Module that will contain the module-related functionality. The modulepath can be extended by setting the environment variable PUPPETLIB git-svn-id: https://reductivelabs.com/svn/puppet/trunk@2276 980ebf18-57e1-0310-9a29-db15c13687c0
Diffstat (limited to 'lib/puppet/configuration.rb')
-rw-r--r--lib/puppet/configuration.rb5
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/puppet/configuration.rb b/lib/puppet/configuration.rb
index 7c66cc11e..dfa716d42 100644
--- a/lib/puppet/configuration.rb
+++ b/lib/puppet/configuration.rb
@@ -163,7 +163,10 @@ module Puppet
:group => "$group",
:desc => "Where FileBucket files are stored."
},
- :ca => [true, "Wether the master should function as a certificate authority."]
+ :ca => [true, "Wether the master should function as a certificate authority."],
+ :modulepath => [ "$confdir/modules:/usr/share/puppet/modules",
+ "The search path for modules as a colon-separated list of
+ directories." ]
)
self.setdefaults("puppetd",