From: Guillaume Pellerin <yomguy@parisson.com>
Date: Tue, 7 Apr 2015 14:31:24 +0000 (+0200)
Subject: add haystack modules, update_index
X-Git-Tag: 1.6a^2~18^2~2
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=c0c8411bc3d1cb3dd51b6dbed42d91002feb8592;p=telemeta.git

add haystack modules, update_index
---

diff --git a/examples/deploy/celery_app.sh b/examples/deploy/celery_app.sh
index 856d3eb4..ac08e3c3 100644
--- a/examples/deploy/celery_app.sh
+++ b/examples/deploy/celery_app.sh
@@ -6,6 +6,10 @@ sandbox='/home/sandbox'
 manage=$sandbox'/manage.py'
 wsgi=$sandbox'/wsgi.py'
 
+# stating apps
+pip install django-haystack elasticsearch
+
+# waiting for other services
 sh $app_dir/examples/deploy/wait.sh
 
 # Starting celery worker with the --autoreload option will enable the worker to watch for file system changes
diff --git a/examples/deploy/start_app.sh b/examples/deploy/start_app.sh
index 601ba954..47179f85 100644
--- a/examples/deploy/start_app.sh
+++ b/examples/deploy/start_app.sh
@@ -7,6 +7,10 @@ sandbox='/home/sandbox'
 manage=$sandbox'/manage.py'
 wsgi=$sandbox'/wsgi.py'
 
+# stating apps
+pip install django-haystack elasticsearch
+
+# waiting for other services
 sh $app_dir/examples/deploy/wait.sh
 
 # django init
@@ -15,6 +19,7 @@ python $manage migrate --noinput
 python $manage collectstatic --noinput
 python $manage telemeta-create-admin-user
 python $manage telemeta-create-boilerplate
+python $manage update_index
 
 # static files auto update
 watchmedo shell-command --patterns="*.js;*.css" --recursive \
diff --git a/setup.py b/setup.py
index 19c6f6c4..d62ede84 100644
--- a/setup.py
+++ b/setup.py
@@ -64,6 +64,7 @@ setup(
         'django-google-tools',
         'django-ipauth',
         'django-celery',
+        'django-haystack',
         'timeside>=0.7',
         'south',
         'sorl-thumbnail',
@@ -72,7 +73,7 @@ setup(
         'pyyaml',
         'python-ebml',
         'zipstream',
-        'django-haystack'
+        'elasticsearch',
     ],
   tests_require=['pytest-django', 'pytest-cov', 'factory-boy'],
   # Provide a test command through django-setuptest