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
remove port from upstream member when service is defined #1283
base: master
Are you sure you want to change the base?
Conversation
The [*service*] parameter of the upstream member enables port discovery via DNS SRV records. When it is used, a server port must not be specified or nginx will fail with the following error: nginx: [emerg] service upstream may not have port
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks correct but I'll let Travis finish
Hi @hbog, thanks for the change. Are you able to provide a tiny acceptance test for this? So we know for sure that the generated config works. You can find some examples in https://github.com/voxpupuli/puppet-nginx/tree/master/spec/acceptance. Let us know if you need some help. We're reachable in the #voxpupuli IRC channel on freenode and on https://slack.puppet.com |
@bastelfreak I think acceptance tests are hard here because SRV records are hard without a real DNS server. I guess it'd be enough to verify that the server actually starts up though. |
The |
I would already be happy when we know that the generated config works and the daemon starts. IMO there is no need to test the actual SRV records. As mentioned in the other PR, I didn't know that this requires nginx-plus, so I assume simple acceptance testing won't be possible. Can you please update the docs with this new parameter? I think we can merge this without the acceptance tests. |
Ping @hbog :) |
Dear @hbog, thanks for the PR! This is pccibot, your friendly Vox Pupuli GitHub Bot. I noticed that your pull request contains merge conflict. Can you please rebase? You can find my sourcecode at voxpupuli/vox-pupuli-tasks |
1 similar comment
Dear @hbog, thanks for the PR! This is pccibot, your friendly Vox Pupuli GitHub Bot. I noticed that your pull request contains merge conflict. Can you please rebase? You can find my sourcecode at voxpupuli/vox-pupuli-tasks |
Dear @hbog, thanks for the PR! This is pccibot, your friendly Vox Pupuli GitHub Bot. I noticed that your pull request contains merge conflict. Can you please rebase? You can find my sourcecode at voxpupuli/vox-pupuli-tasks |
Dear @hbog, thanks for the PR! This is pccibot, your friendly Vox Pupuli GitHub Bot. I noticed that your pull request contains merge conflict. Can you please rebase? You can find my sourcecode at voxpupuli/vox-pupuli-tasks |
The
service
parameter of the upstream member enables port discoveryvia DNS SRV records. When it is used, a server port must not be
specified or nginx will fail with the following error:
Pull Request (PR) description
The PR removes the port from the server directive when the
service
parameter is set and updates the corresponding unit test.This Pull Request (PR) fixes the following issues
Fixes #1282