Overwrite UWSGI_OPTS from ENV or adapt with EXTRA_UWSGI_OPTS#115
Merged
Overwrite UWSGI_OPTS from ENV or adapt with EXTRA_UWSGI_OPTS#115
Conversation
2b8bf1c to
aafbe52
Compare
aafbe52 to
6d47fd7
Compare
Member
|
This looks great, thanks @BWibo
Many thanks |
Contributor
Author
|
The new docs are here: ckan/ckan-docker#215 |
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 PR resolves #114. It extends the bahavior of
start_ckan.shto allow both overwriting and extending theuwsgicommand line args. The current behavior ofUWSGI_OPTSenv var remains untouched, so this won't affect users that already overwirteUWSGI_OPTS, or don't.start_ckan.shthere is a new env varDEFAULT_UWSGI_OPTSthat defines default options foruwsgi. This contains what was previously stored inUWSGI_OPTSinstart_ckan.sh.UWSGI_OPTSis set at runtime,DEFAULT_UWSGI_OPTSis overwritten with the content ofUWSGI_OPTS.EXTRA_UWSGI_OPTSis set at runtime, its content is appended toUWSG_OPTS.UWSGI_HARAKIRIa default values of 60 is introduced.If there is any place to document this, let me know, I can add documentation.
Happily awaiting your review. :-)