add docker_local_settings and remove unnecessary REDIS settings definition in settings.py because it is already handled in local settings

This commit is contained in:
Jonathan Math 2020-10-05 00:19:22 +07:00
parent 54e31d2597
commit 5d82414563
2 changed files with 3 additions and 29 deletions

View file

@ -81,9 +81,6 @@ DATABASES = {
'USER': 'newsblur',
'PASSWORD': 'newsblur',
'HOST': 'postgres',
'OPTIONS': {
"autocommit": True,
},
},
}
@ -119,6 +116,9 @@ REDIS_SESSIONS = {
'port': 6379
}
CELERY_REDIS_DB_NUM = 4
SESSION_REDIS_DB = 5
ELASTICSEARCH_FEED_HOSTS = ["elasticsearch:9200"]
ELASTICSEARCH_STORY_HOSTS = ["elasticsearch:9200"]

View file

@ -543,32 +543,6 @@ class MasterSlaveRouter(object):
"Explicitly put all models on all databases."
return True
# =========
# = Redis =
# =========
REDIS = {
'host': '127.0.0.1',
}
REDIS_PUBSUB = {
'host': '127.0.0.1',
}
REDIS_STORY = {
'host': '127.0.0.1',
}
REDIS_SESSIONS = {
'host': '127.0.0.1',
}
CELERY_REDIS_DB_NUM = 4
SESSION_REDIS_DB = 5
# =================
# = Elasticsearch =
# =================
ELASTICSEARCH_FEED_HOSTS = ['db_search_feed:9200']
ELASTICSEARCH_STORY_HOSTS = ['db_search_story:9200']
# ===============
# = Social APIs =