diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/puppet/configuration.rb | 6 | ||||
| -rw-r--r-- | lib/puppet/util/provider_features.rb | 8 |
2 files changed, 9 insertions, 5 deletions
diff --git a/lib/puppet/configuration.rb b/lib/puppet/configuration.rb index f711ce3ec..86d7dbfdc 100644 --- a/lib/puppet/configuration.rb +++ b/lib/puppet/configuration.rb @@ -15,8 +15,10 @@ module Puppet end self.setdefaults(:puppet, - :confdir => [conf, "The main Puppet configuration directory."], - :vardir => [var, "Where Puppet stores dynamic and growing data."], + :confdir => [conf, "The main Puppet configuration directory. The default for this parameter is calculated based on the user. If the process + is runnig as root or the user that ``puppetmasterd`` is supposed to run as, it defaults to a system directory, but if it's running as any other user, + it defaults to being in ``~``."], + :vardir => [var, "Where Puppet stores dynamic and growing data. The default for this parameter is calculated specially, like `confdir`_."], :name => [name, "The name of the service, if we are running as one. The default is essentially $0 without the path or ``.rb``."] ) diff --git a/lib/puppet/util/provider_features.rb b/lib/puppet/util/provider_features.rb index b6e54b5bd..3aeb627a3 100644 --- a/lib/puppet/util/provider_features.rb +++ b/lib/puppet/util/provider_features.rb @@ -1,13 +1,15 @@ # Provides feature definitions. +require 'puppet/util/methodhelper' +require 'puppet/util/docs' +require 'puppet/util' module Puppet::Util::ProviderFeatures + include Puppet::Util::Docs # The class that models the features and handles checking whether the features # are present. class ProviderFeature - require 'puppet/util/methodhelper' - require 'puppet/util/docs' - require 'puppet/util' include Puppet::Util include Puppet::Util::MethodHelper + include Puppet::Util::Docs attr_accessor :name, :docs, :methods # Are all of the requirements met? |