Fix appending puppet config entry #762
Closed
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
ekohl
reviewed
Sep 15, 2020
| @@ -73,6 +73,17 @@ | |||
| puppet::config::main { $key: value => $value } | |||
| } | |||
|
|
|||
| # Ensure there is a newline at the end of puppet.conf | |||
| $newline = $facts['os']['family'] ? { | |||
| 'Windows' => "\r\n", | |||
There was a problem hiding this comment.
This feels a bit odd since the other parts only use \n and not \r\n.
| @@ -30,7 +30,7 @@ | |||
| # they make sure that '1_main ' is ordered before '1_main_*' | |||
| ensure_resource('concat::fragment', "puppet.conf_${section}", { | |||
| target => "${puppet::dir}/puppet.conf", | |||
| content => "\n[${section}]", | |||
| content => "\n\n[${section}]", | |||
There was a problem hiding this comment.
The only downside of this is that you end up with 2 empty lines at the start of the file. I'm not sure how to best deal with that.
|
#782 was merged and resolves the issue. |
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.
This fixes issue #759 by reverting e87d8f2 and then adding a newline to the end of the puppet.conf file.