Generate Nginx includes for advanced configuration (e.g. SSL) (rebased onto metadata53)#5387
Merged
joshmoore merged 6 commits intoome:metadata53from Aug 16, 2017
Merged
Conversation
Also add a test to check the comment and generated location more or less matches the full recommended nginx config.
Member
Author
|
--rebased-from #5381 |
This was referenced Jul 20, 2017
Member
Author
|
--rebased-to #5388 |
Member
|
Merged to mainline. |
This file contains hidden or 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
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 is the same as gh-5381 but rebased onto metadata53.
What this PR does
This creates a minimal nginx configuration file that can be included in a fixed file created by a sysadmin. This allows custom nginx options to be defined once (e.g. SSL options), instead of having to modify the generated web config after every upgrade, and means any Nginx server options can be used.
Testing this PR
includestatement for the generated omero-web config. This file is exclusively managed by the sysadmin e.g./etc/nginx/conf.d/omero-web-wrapper.conf:includestatement. The expectation is that this would be routinely regenerated on every OMERO.web upgrade. e.g.omero web startRelated reading
Notes
omero web config nginx-locationgenerates thelocationblocks only, other server options are now left for the sysadmin to manage e.g.sendfile on;,client_max_body_size 0;.upstreamblock since there was only one server which means it's redundant, and it would be impossible to auto-generate a load-balanced upstream configuration since you'd need to know the addresses of all OMERO.web backends.