Fix streamhost support #933
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
This was referenced Oct 18, 2016
Closed
cegeka-jenkins
pushed a commit
to cegeka/puppet-nginx
that referenced
this pull request
Sep 13, 2019
Fix streamhost support
Rubueno
pushed a commit
to Rubueno/puppet-nginx
that referenced
this pull request
Oct 19, 2020
Fix streamhost support
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.
h/t to @modax and @alwiesner)
This is my attempt to combine #790, #784, while also incorporating the changes from #878. It adds back the $stream variable, which I incorrectly removed in #878, thinking it wasn't used in the nginx.conf tepmlate (it is). The placement of the various conditionals could be reworked if folks think it would be easier to read or less confusing. Would love suggestions as far as any tests that should be added.
This should address #s 1,2,3 from #784, but in a way that applies cleanly to current master and doesn't include any extraneous commits.
It looks like
$streamdid, in fact, control including/etc/nginx/conf.stream.d, however, maybe that include didn't get updated when someone added support forstreams-{enabled,available}. The configs will still get built if streamhosts are defined, but they won't be included unless$streamis set.I don't have any experience with this functionality, so, while this is passing test, I'd love for someone to do functional testing with this if at all possible.