From: Mathieu <mathieu.boye28@gmail.com>
Date: Tue, 5 Apr 2016 04:56:01 +0000 (+0200)
Subject: Merge remote-tracking branch 'upstream/dev' into dev
X-Git-Tag: 1.6.2^2~15^2~10^2~25
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=03981191a4a76d17532bbce12bb622de0bc3fd05;p=telemeta.git

Merge remote-tracking branch 'upstream/dev' into dev
---

03981191a4a76d17532bbce12bb622de0bc3fd05
diff --cc app/deploy/app.sh
index 37b13b9f,9593c324..4e5d6d8a
--- a/app/deploy/app.sh
+++ b/app/deploy/app.sh
@@@ -21,16 -21,11 +21,14 @@@ gid='www-data
  # stating apps
  # pip install django-angular
  
- # waiting for other services
+ # waiting for other network services
  sh $app/deploy/wait.sh
  
- # waiting for available database
- python $app/wait.py
- 
 +#fix contains haystack elasticsearch
 +cd /opt/miniconda/lib/python2.7/site-packages/haystack/backends && sed -i "s/'contains': u'%s'/'contains': u'*%s*'/g" elasticsearch_backend.py && cd $app
 +
- # django init
+ # django setup
+ python $manage wait-for-db
  python $manage syncdb --noinput
  python $manage migrate --noinput
  python $manage bower_install -- --allow-root