From 798f0c51173f861728c6afd24d69277f30a8248d Mon Sep 17 00:00:00 2001 From: Simon Caminada Date: Wed, 20 Jun 2018 11:00:22 +0200 Subject: [PATCH] clean up --- requirements.in | 4 +--- settings.py | 10 ++++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/requirements.in b/requirements.in index 9dcbebb..27f6e58 100644 --- a/requirements.in +++ b/requirements.in @@ -11,9 +11,7 @@ https://control.divio.com/api/v1/apps/serve/djangocms-picture/2.0.6/005e8663-d1c https://control.divio.com/api/v1/apps/serve/djangocms-text-ckeditor/3.5.3/a7b5179f-cea5-4af8-b235-6b7f709c4e6a/djangocms-text-ckeditor-3.5.3.tar.gz#egg=djangocms-text-ckeditor==3.5.3 https://control.divio.com/api/v1/apps/serve/django-filer/1.3.2/a68cceeb-0373-47af-9cf6-01dbc9bead40/django-filer-1.3.2.tar.gz#egg=django-filer==1.3.2 # -Whoosh==2.7.4 -django-haystack==2.8.1 -aldryn-search==1.0.0 +aldryn-search==1.0.1 django-fontawesome==0.3.1 mailchimp3==2.1.0 django-image-cropping==1.1.0 diff --git a/settings.py b/settings.py index 83f6dcc..f96b9b4 100644 --- a/settings.py +++ b/settings.py @@ -62,15 +62,17 @@ HAYSTACK_CUSTOM_HIGHLIGHTER = 'project.search.Highlighter' HAYSTACK_DEFAULT_OPERATOR = 'OR' HAYSTACK_CONNECTIONS = { 'default': { - 'ENGINE': 'project.filestore.S3WhooshEngine', - 'PATH': os.path.join('/whoosh', 'default'), + 'ENGINE': 'haystack.backends.elasticsearch2_backend.Elasticsearch2SearchBackend', + 'URL': 'https://wa6vrcqzp9:wdx2qnhlh2@search-sandbox-9002842602.eu-west-1.bonsaisearch.net', + 'INDEX_NAME': 'default', }, } for lang_code, lang in LANGUAGES: HAYSTACK_CONNECTIONS[lang_code] = {} HAYSTACK_CONNECTIONS[lang_code].update({ - 'ENGINE': 'project.filestore.S3WhooshEngine', - 'PATH': os.path.join('/whoosh', lang_code), + 'ENGINE': 'haystack.backends.elasticsearch2_backend.Elasticsearch2SearchBackend', + 'URL': 'https://wa6vrcqzp9:wdx2qnhlh2@search-sandbox-9002842602.eu-west-1.bonsaisearch.net', + 'INDEX_NAME': lang_code, }) HAYSTACK_ROUTERS = ['aldryn_search.router.LanguageRouter', ]