diff --git a/newsblur/docker_local_settings.py b/newsblur/docker_local_settings.py index 37e67bb47..ed141083d 100644 --- a/newsblur/docker_local_settings.py +++ b/newsblur/docker_local_settings.py @@ -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"] diff --git a/newsblur/settings.py b/newsblur/settings.py index 0f0f1152c..9db603b5c 100644 --- a/newsblur/settings.py +++ b/newsblur/settings.py @@ -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 =