Reorganise whitespace in the vhost header and location header/footer. #502
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
The current template inserts newlines after a location, which doesn't seem logical; one can't assume there will always be more blocks that follow. Therefore it is only logical to include the newline before a new location block is inserted, which lends itself to the convention of only prepending newlines to blocks, never appending them.
3flex
added a commit
that referenced
this pull request
Nov 12, 2014
Reorganise whitespace in the vhost header and location header/footer.
cegeka-jenkins
pushed a commit
to cegeka/puppet-nginx
that referenced
this pull request
Oct 23, 2017
Reorganise whitespace in the vhost header and location header/footer.
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.
The current vhost header and location header/footer templates insert new lines after a location, which can lead to overlapping/joined lines, and doesn't seem the best approach; as one can't assume there will always be more blocks that follow.
It would be more appropriate to include the new line before a new location block (or any other block inside the vhost for that matter) is inserted, which then naturally lends itself to the convention of only pre-pending new lines to said configuration blocks, never appending them.
I stumbled onto this when I came across a location statement that was appearing on the same line as other directives, the error log to be precise.