RABBITMQ_*, MEMCACHED_LOCATION, REDIS_* configurable in settings.py #436
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
|
Automated message from Dropbox CLA bot @galexrt, thanks for the pull request! It looks like you haven't yet signed the Dropbox CLA. Please sign it here and update the thread so we can consider merging your code. |
| @@ -327,8 +333,10 @@ def get_secret(key): | |||
| ######################################################################## | |||
|
|
|||
| USING_RABBITMQ = True | |||
| # RABBITMQ_HOST default is 'localhost' | |||
| RABBITMQ_USERNAME = 'zulip' | |||
There was a problem hiding this comment.
You need to remove this line or the default above won't take effect.
…n the /etc/zulip/settings.py Allow to specify the rabbitmq server address Moved the RABBITMQ_HOST to DEFAULT_SETTINGS (with default localhost) PR #431, See #431 (comment) Added commented RABBITMQ_HOST to the local_settings_template.py with a small comment what it does Expaneded the comment as @timabbott commented See #431 (comment) Something went wrong with the merging Fixed the memcached comment
|
@timabbott Sry about that comment, had some troubles rebasing/mergin everything, but I fixed the memcached comment now. |
|
OK cool, I'm going to do a few small tweaks to the comments (and fix |
|
Merged! |
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 pull request is PR #431 with more configurable variables.
When this pull request is merged, I can create the pull request for the (better) Dockerfile without any "sed" hacks.