diff options
| author | James Turnbull <james@lovedthanlost.net> | 2008-01-19 09:45:14 +1100 |
|---|---|---|
| committer | James Turnbull <james@lovedthanlost.net> | 2008-01-19 09:45:14 +1100 |
| commit | f335dc31f11f4bed80e91df041febdca6e33d3c2 (patch) | |
| tree | fe74bdef81e0666b399ed3d1c214e686e0df9fa3 /lib/puppet/defaults.rb | |
| parent | d8991abac0b5302fe4202940b637dc4477d5e44e (diff) | |
| download | puppet-f335dc31f11f4bed80e91df041febdca6e33d3c2.tar.gz puppet-f335dc31f11f4bed80e91df041febdca6e33d3c2.tar.xz puppet-f335dc31f11f4bed80e91df041febdca6e33d3c2.zip | |
Updated defaults.rb to fix foru error stopping man page creation - links are not as neat as before but puppet.conf.man file will create neatly now.
Diffstat (limited to 'lib/puppet/defaults.rb')
| -rw-r--r-- | lib/puppet/defaults.rb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/puppet/defaults.rb b/lib/puppet/defaults.rb index a767d2952..cfbdf7bc7 100644 --- a/lib/puppet/defaults.rb +++ b/lib/puppet/defaults.rb @@ -305,7 +305,7 @@ module Puppet :manifest => ["$manifestdir/site.pp", "The entry-point manifest for puppetmasterd."], :code => ["", "Code to parse directly. This is essentially only used - by ``puppet`, and should only be set if you're writing your own Puppet + by ``puppet``, and should only be set if you're writing your own Puppet executable"], :masterlog => { :default => "$logdir/puppetmaster.log", :owner => "$user", @@ -343,11 +343,11 @@ module Puppet :ssl_client_header => ["HTTP_X_CLIENT_DN", "The header containing an authenticated client's SSL DN. Only used with Mongrel. This header must be set by the proxy to the authenticated client's SSL DN (e.g., ``/CN=puppet.reductivelabs.com``). - See the `UsingMongrel`:trac: wiki page for more information."], + See the http://reductivelabs.com/puppet/trac/wiki/UsingMongrel page for more information."], :ssl_client_verify_header => ["HTTP_X_CLIENT_VERIFY", "The header containing the status message of the client verification. Only used with Mongrel. This header must be set by the proxy to 'SUCCESS' if the client successfully authenticated, and anything else otherwise. - See the `UsingMongrel`:trac: wiki page for more information."] + See the http://reductivelabs.com/puppet/trac/wiki/UsingMongrel page for more information."] ) self.setdefaults(:puppetd, @@ -597,7 +597,7 @@ module Puppet setdefaults(:ldap, :ldapnodes => [false, "Whether to search for node configurations in LDAP. See - `LdapNodes`:trac: for more information."], + http://reductivelabs.com/puppet/trac/wiki/LdapNodes/ for more information."], :ldapssl => [false, "Whether SSL should be used when searching for nodes. Defaults to false because SSL usually requires certificates |