Updated descriptions for 1.4 settings #157
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| ##### email_reply_address | ||
|
|
||
| The return address applied to outgoing emails. | ||
| Default: Foreman-noreply@<your domain> | ||
|
|
||
| ##### enc_environment | ||
|
|
||
| When this is _true_, Foreman will send the puppet environment in the ENC yaml output. This is meant to fix conflicts between a node's puppet.conf environment and the environment set in Foreman. When set to false, the ENC yaml will not contain the environment and the node will not update its environment and use the one set at puppet.conf. |
There was a problem hiding this comment.
I'd specifically say that Puppet agents (as of version 3) will take the environment set in Foreman (the ENC) when true. Nitpick, use _false_, two "ands" in the last sentence.
|
Really nice, bet you learned a thing or two in the process :) |
|
Indeed! I've just addressed your comments. |
|
|
||
| ##### require_ssl_puppetmasters | ||
|
|
||
| SSL certificates will be used to contact smart proxies and check ENC output over HTTPS, require_ssl in ```config/settings.yaml``` should be enabled too. For more information about securing the connection between Foreman and puppet masters, see [Section 5.4.1](manuals/{{page.version}}/index.html#5.4.1SecuringPuppetMasterRequests) |
There was a problem hiding this comment.
Can you change the first sentence to:
When set to _true_, Foreman requires a client SSL certificate on requests from puppet masters, and will verify the CN of the certificate against the known smart proxies. If false, it uses the reverse DNS of the IP address making the request.
Better descriptions for administrator settings Link to template writing guide in Foreman wiki Further explain require_ssl_puppetmasters
domcleal
added a commit
that referenced
this pull request
Jan 30, 2014
Updated descriptions for 1.4 settings
|
Thanks @elobato! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Descriptions for Foreman settings in 1.4 - this is supposed to address #141