From ac9d2a77fc7f7097309056adfbbe53aca1adbb9c Mon Sep 17 00:00:00 2001 From: Simon Caminada Date: Mon, 9 Apr 2018 14:09:24 +0200 Subject: [PATCH] solr backend --- docker-compose.yml | 14 ++++++++++++++ requirements.in | 1 + settings.py | 6 ++++-- 3 files changed, 19 insertions(+), 2 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index e053ad0..00a3537 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -5,6 +5,7 @@ services: build: "." links: - "db:postgres" + - "solr:solr" ports: - "8009:80" volumes: @@ -20,3 +21,16 @@ services: volumes: - ".:/app:rw" + solr: + image: solr:7.2-alpine + ulimits: + memlock: + soft: 20480 + hard: 20480 + environment: + - "SOLR_HEAP=24m" + volumes: + - "./schema_de.xml:/opt/solr/server/solr/de/schema.xml" + - "./schema_en.xml:/opt/solr/server/solr/en/schema.xml" + expose: + - "8983" diff --git a/requirements.in b/requirements.in index a42e50c..4a5dea3 100644 --- a/requirements.in +++ b/requirements.in @@ -11,6 +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.0.1/bcb7d25b-6922-48a9-a252-9bc165f6403e/django-filer-1.3.0.1.tar.gz#egg=django-filer==1.3.0.1 # +pysolr==3.7.0 django-haystack==2.7.0 aldryn-search==0.5.0 django-fontawesome==0.3.1 diff --git a/settings.py b/settings.py index a445432..ffaf3fb 100644 --- a/settings.py +++ b/settings.py @@ -59,13 +59,15 @@ HAYSTACK_CUSTOM_HIGHLIGHTER = 'project.search.Highlighter' HAYSTACK_DEFAULT_OPERATOR = 'OR' HAYSTACK_CONNECTIONS = { 'default': { - 'ENGINE': 'haystack.backends.simple_backend.SimpleEngine', + 'ENGINE': 'haystack.backends.solr_backend.SolrEngine', + 'URL': 'http://localhost:8983/solr/de/', }, } for lang_code, lang in LANGUAGES: HAYSTACK_CONNECTIONS[lang_code] = {} HAYSTACK_CONNECTIONS[lang_code].update({ - 'ENGINE': 'haystack.backends.simple_backend.SimpleEngine', + 'ENGINE': 'haystack.backends.solr_backend.SolrEngine', + 'URL': 'http://localhost:8983/solr/{}'.format(lang_code), }) HAYSTACK_ROUTERS = ['aldryn_search.router.LanguageRouter', ]