From: mathieu <mathieu.boye28@gmail.com>
Date: Wed, 11 May 2016 10:31:11 +0000 (+0200)
Subject: Merge Parisson/dev + add DATASTART env
X-Git-Tag: 1.6.2^2~15^2~4^2
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=82b5ff2fb20833a1c858695dfb31c0d90f1c8c3a;p=telemeta.git

Merge Parisson/dev + add DATASTART env
---

82b5ff2fb20833a1c858695dfb31c0d90f1c8c3a
diff --cc app/scripts/app.sh
index b0a8f8ae,1f2568a6..7053ff92
--- a/app/scripts/app.sh
+++ b/app/scripts/app.sh
@@@ -30,14 -30,9 +30,16 @@@ python $manage migrate --noinpu
  python $manage bower_install -- --allow-root
  python $manage collectstatic --noinput
  
- if [ ! -f .init ]; then
-     chown -R www-data:www-data $media
-     python $manage telemeta-create-admin-user
-     python $manage telemeta-create-boilerplate
-     touch .init
- elif [ $REINDEX = "True" ]; then
+ # telemeta setup
++if [ $DATASTART = "True" ]
++then
+ python $manage telemeta-create-admin-user
+ python $manage telemeta-create-boilerplate
++fi
++
++if [ $REINDEX = "True" ]; then
 +    python $manage rebuild_index --noinput
 +fi
  
  if [ $DEBUG = "False" ]; then
      python $manage update_index --workers $processes &
diff --cc env/debug.env
index 7a9fbbcc,465d6beb..f43f7d26
--- a/env/debug.env
+++ b/env/debug.env
@@@ -17,5 -17,3 +17,6 @@@ BROKER_URL=redis://broker:6379/
  
  # If this is True, all tasks will be executed locally by blocking until the task returns.
  CELERY_ALWAYS_EAGER=False
 +
- REINDEX=True
++REINDEX=False
++DATASTART=False
diff --cc telemeta/locale
index 66caac4d,ea6605ad..0790c8f8
--- a/telemeta/locale
+++ b/telemeta/locale
@@@ -1,1 -1,1 +1,1 @@@
- Subproject commit 66caac4dce0b50451e5755e42240444ad33e9647
 -Subproject commit ea6605ad78243d798d88f1ffc46c8f6bc507ce11
++Subproject commit 0790c8f8c2df57d782176710d73795734d034111