From 0b6072e3d32dae80867f3ea0ae5b40b339dabf06 Mon Sep 17 00:00:00 2001 From: Nick Sergeant Date: Mon, 18 Sep 2017 11:16:58 -0400 Subject: [PATCH] Cleanup haystack connections. --- settings.py | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/settings.py b/settings.py index 50ba3d2..3ecd01a 100644 --- a/settings.py +++ b/settings.py @@ -13,8 +13,7 @@ if 'DATABASE_URL' in os.environ: if 'SEARCHBOX_SSL_URL' in os.environ: - es = urlparse(os.environ.get('SEARCHBOX_SSL_URL') or - 'http://127.0.0.1:9200/') + es = urlparse(os.environ.get('SEARCHBOX_SSL_URL')) port = es.port or 443 @@ -31,16 +30,15 @@ if 'SEARCHBOX_SSL_URL' in os.environ: "http_auth": es.username + ':' + es.password } -if 'HAYSTACK_URL' in os.environ: +else: HAYSTACK_CONNECTIONS = { 'default': { - 'ENGINE': 'haystack.backends.elasticsearch_backend.ElasticsearchSearchEngine', - 'URL': os.environ.get('HAYSTACK_URL'), - 'INDEX_NAME': 'snipts', - }, + 'ENGINE': 'haystack.backends.simple_backend.SimpleEngine' + } } + ABSOLUTE_URL_OVERRIDES = {'auth.user': lambda u: "/%s/" % u.username} ACCOUNT_ACTIVATION_DAYS = 0 ADMINS = (('Nick Sergeant', 'nick@snipt.net'),)