From: Thomas Fillon <thomas@parisson.com>
Date: Wed, 5 Jul 2017 16:07:27 +0000 (+0200)
Subject: Merge branch 'dev' into release/1.7
X-Git-Tag: 1.7.0~2^2~21^2^2~8
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=9b0826c97074e174649f46b6259c8370d7d5724b;p=telemeta.git

Merge branch 'dev' into release/1.7
---

9b0826c97074e174649f46b6259c8370d7d5724b
diff --cc app/scripts/app.sh
index 83d0bd2a,21d6daaf..667a9c7f
--- a/app/scripts/app.sh
+++ b/app/scripts/app.sh
@@@ -26,16 -22,21 +26,19 @@@ pip install -e git+https://github.com/P
  
  # waiting for other network services
  sh $app/scripts/wait.sh
 -
 -# django setup
  python $manage wait-for-db
 -python $manage syncdb --noinput
 -python $manage migrate --noinput
 -python $manage bower_install -- --allow-root
 -python $manage collectstatic --noinput
  
 -# telemeta setup
 -python $manage telemeta-create-admin-user
 -python $manage telemeta-create-boilerplate
 +# initial setup
 +if [ ! -f .init ]; then
 +    bash $app/scripts/init.sh
 +    touch .init
 +fi
 +
 +python $manage bower_install -- --allow-root
  
+ # Delete Timeside database if it exists
+ cat /srv/src/telemeta/scripts/sql/drop_timeside.sql | python $manage dbshell
+ 
  if [ $REINDEX = "True" ]; then
      python $manage rebuild_index --noinput
  fi