(maint) don't print diff root password in diff #732
Merged
Conversation
This file contains hidden or 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
For puppet versions that support it, suppress diffing root's password.
tphoney
added a commit
that referenced
this pull request
Jul 14, 2015
(maint) don't print diff root password in diff
| @@ -17,6 +17,10 @@ | |||
| owner => 'root', | |||
| mode => '0600', | |||
| } | |||
| # show_diff was added with puppet 3.0 | |||
| if versioncmp($::puppetversion, '3.0') <= 0 { | |||
| File["${::root_home}/.my.cnf"] { show_diff => false } | |||
There was a problem hiding this comment.
nice. i didn't realize you could add defaults for specific resources.
There was a problem hiding this comment.
this is not a default. this is actually setting the value and will cause a conflict if done twice.
There was a problem hiding this comment.
oh! thanks for the clarification
Merged
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.
For puppet versions that support it, suppress diffing root's password.