Please review pull request #260: Ticket/2.7.x/11291 show diffs description opened by (nfagerlund)
Description:
Update the description of show_diff to match behavior as of 2.7.8.
Issue #2744 changed the behavior of diff printing so that diffs pass through
Puppet's reporting/logging system, which changes both the situations where it
is useful to print diffs, and the security considerations of printing diffs. This
commit updates the setting's description accordingly.
- Opened: Thu Dec 08 19:38:05 UTC 2011
- Based on: puppetlabs:2.7.x (eae2c9df6f956f36ee3419997c12710e20b440ff)
- Requested merge: nfagerlund:ticket/2.7.x/11291_show_diffs_description (901a6b26c06dbfd8fa52be9c5a7f24bcaae4144a)
Diff follows:
diff --git a/lib/puppet/defaults.rb b/lib/puppet/defaults.rb
index 1d4b1a9..49b7dab 100644
--- a/lib/puppet/defaults.rb
+++ b/lib/puppet/defaults.rb
@@ -109,8 +109,9 @@ module Puppet
},
:diff_args => ["-u", "Which arguments to pass to the diff command when printing differences between files."],
:diff => ["diff", "Which diff command to use when printing differences between files."],
- :show_diff => [false, "Whether to print a contextual diff when files are being replaced. The diff
- is printed on stdout, so this option is meaningless unless you are running Puppet interactively.
+ :show_diff => [false, "Whether to log and report a contextual diff when files are being replaced. This causes
+ partial file contents to pass through Puppet's normal logging and reporting system, so this setting should be
+ used with caution if you are sending Puppet's reports to an insecure destination.
This feature currently requires the `diff/lcs` Ruby library."],
:daemonize => {
:default => (Puppet.features.microsoft_windows? ? false : true),
@@ -622,7 +623,7 @@ module Puppet
it with the `--no-client` option."],
:listen => [false, "Whether puppet agent should listen for
connections. If this is true, then puppet agent will accept incoming
- REST API requests, subject to the default ACLs and the ACLs set in
+ REST API requests, subject to the default ACLs and the ACLs set in
the `rest_authconfig` file. Puppet agent can respond usefully to
requests on the `run`, `facts`, `certificate`, and `resource` endpoints."],
:ca_server => ["$server", "The server to use for certificate
-- You received this message because you are subscribed to the Google Groups "Puppet Developers" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to [email protected].
For more options, visit this group at http://groups.google.com/group/puppet-dev?hl=en.
