Remove custom backend

Former-commit-id: c27ef4ef566418e76bf2ba4689df1eaac1939d28

diff --git a/app/deploy/app.sh b/app/deploy/app.sh
index 6a95a0b24d6dd9cf6e751a512516eda2ae9de165..3ae848606a3c39d689a4ecee3760e9f99460e30c 100644 (file)
--- a/app/deploy/app.sh
+++ b/app/deploy/app.sh
@@ -34,7 +34,7 @@ python $manage collectstatic --noinput
 python $manage telemeta-create-admin-user
 python $manage telemeta-create-boilerplate
 
-if [ $REINDEX = "True"]
+if [ $REINDEX = "True" ]
 then
 python $manage rebuild_index --noinput
 fi

diff --git a/app/sandbox/settings.py b/app/sandbox/settings.py
index 080ccb037718425df0d6e9810ab75460f06a4a85..c31f79c783d15d3a874ae7fc9f2c35d4b890f02a 100644 (file)
--- a/app/sandbox/settings.py
+++ b/app/sandbox/settings.py
@@ -302,7 +302,7 @@ from worker import app
 
 HAYSTACK_CONNECTIONS = {
     'default': {
-        'ENGINE': 'telemeta.util.backend.CustomElasticEngine',
+        'ENGINE': 'haystack.backends.elasticsearch_backend.ElasticsearchSearchEngine',
         'URL': 'http://search:9200/',
         'INDEX_NAME': 'haystack',
         'INLUDE_SPELLING': True,

diff --git a/data/backup/b57a9339fe.sql.REMOVED.git-id b/data/backup/b57a9339fe.sql.REMOVED.git-id
new file mode 100644 (file)
index 0000000..87a6ff2
--- /dev/null
+++ b/data/backup/b57a9339fe.sql.REMOVED.git-id
@@ -0,0 +1 @@
+3a6f83feeb737d406aea74e03ae989969a5af9ff
\ No newline at end of file

diff --git a/env/build.yml b/env/build.yml
index b37a2aa27f8e76c943b635ea1132361ee6fad6e9..859a32b614916ac0ee6221898e9d38bf7c6c2378 100644 (file)
--- a/env/build.yml
+++ b/env/build.yml
@@ -22,5 +22,5 @@
 # Thomas Fillon <thomas@parisson.com>
 
 app:
-       env_file:
-               ./index.env
+    env_file:
+        env/index.env

diff --git a/telemeta/util/backend.py b/telemeta/util/backend.py
deleted file mode 100644 (file)
index 8c88253..0000000
--- a/telemeta/util/backend.py
+++ /dev/null
@@ -1,13 +0,0 @@
-from haystack.backends.elasticsearch_backend import *
-
-class CustomElasticBackend(ElasticsearchSearchBackend):
-
-    def setup(self):
-        FIELD_MAPPINGS.get('edge_ngram')['search_analyzer']="standard";
-        FIELD_MAPPINGS.get('ngram')['search_analyzer']="standard";
-        eb = super(CustomElasticBackend, self)
-        eb.DEFAULT_SETTINGS.get('settings').get('analysis').get('filter').get('haystack_ngram')['max_gram']=30
-        eb.setup()
-
-class CustomElasticEngine(ElasticsearchSearchEngine):
-    backend = CustomElasticBackend
\ No newline at end of file