Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix streamhost support #933

Merged
merged 1 commit into from
Oct 25, 2016
Merged

Fix streamhost support #933

merged 1 commit into from
Oct 25, 2016

Conversation

wyardley
Copy link
Collaborator

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 $stream did, in fact, control including /etc/nginx/conf.stream.d, however, maybe that include didn't get updated when someone added support for streams-{enabled,available}. The configs will still get built if streamhosts are defined, but they won't be included unless $stream is 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.

@bastelfreak bastelfreak merged commit 0496e2d into voxpupuli:master Oct 25, 2016
@wyardley wyardley deleted the fix_streamhosts_support branch October 27, 2016 17:16
cegeka-jenkins pushed a commit to cegeka/puppet-nginx that referenced this pull request Sep 13, 2019
Rubueno pushed a commit to Rubueno/puppet-nginx that referenced this pull request Oct 19, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants