From: Guillaume Pellerin <yomguy@parisson.com>
Date: Fri, 10 Jun 2016 09:08:22 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin' into crem
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=e98b445ee3b2c02645800034c53971415e2abb4a;p=telemeta.git

Merge remote-tracking branch 'origin' into crem

Conflicts:
	telemeta/locale
	telemeta/pages
---

e98b445ee3b2c02645800034c53971415e2abb4a
diff --cc env/debug.env
index 7059bd06,38984ec5..8ed4c1c6
--- a/env/debug.env
+++ b/env/debug.env
@@@ -1,17 -1,18 +1,18 @@@
- # -- MYSQL DATABASE
+ ## MYSQL DATABASE
  
  ENGINE=django.db.backends.mysql
 -MYSQL_ROOT_PASSWORD=mysecretpassword
 +MYSQL_ROOT_PASSWORD=ItCydyatzix8
  MYSQL_DATABASE=telemeta
  MYSQL_USER=telemeta
 -MYSQL_PASSWORD=mysecretpassword
 +MYSQL_PASSWORD=iuvIlkyisFit2
  
- # -- DJANGO
- 
- DEBUG=False
+ ## DJANGO
  
+ DEBUG=True
  SECRET_KEY=ghv8us2587n97dq&w$c((o5rj_$-9#d-8j#57y_a9og8wux1h7
  
+ ## CELERY
+ 
  # replace broker by localhost if you start your app outside docker-compose
  BROKER_URL=redis://broker:6379/0
  
diff --cc env/prod.env
index 7059bd06,933f0f2c..9f0f7bfa
--- a/env/prod.env
+++ b/env/prod.env
@@@ -1,19 -1,31 +1,31 @@@
- # -- MYSQL DATABASE
+ ## MYSQL DATABASE
  
  ENGINE=django.db.backends.mysql
 -MYSQL_ROOT_PASSWORD=mysecretpassword
 +MYSQL_ROOT_PASSWORD=ItCydyatzix8
  MYSQL_DATABASE=telemeta
  MYSQL_USER=telemeta
 -MYSQL_PASSWORD=mysecretpassword
 +MYSQL_PASSWORD=iuvIlkyisFit2
  
- # -- DJANGO
+ ## DJANGO
  
  DEBUG=False
- 
  SECRET_KEY=ghv8us2587n97dq&w$c((o5rj_$-9#d-8j#57y_a9og8wux1h7
  
+ ## CELERY
+ 
  # replace broker by localhost if you start your app outside docker-compose
  BROKER_URL=redis://broker:6379/0
  
- # If this is True, all tasks will be executed locally by blocking until the task returns.
+ # if this is True, all tasks will be executed locally by blocking until the task returns.
  CELERY_ALWAYS_EAGER=False
+ 
+ ## HAYSTACK
+ 
+ # if this is True, the search index will be rebuild
+ REINDEX=False
+ 
+ HAYSTACK_URL=http://search:9200/
+ 
+ # change index names if hosting multiple search containers
 -HAYSTACK_INDEX_NAME=telemeta
 -HAYSTACK_INDEX_NAME_AUTOCOMPLETE=telemeta_auto
++HAYSTACK_INDEX_NAME=telemeta-crem
++HAYSTACK_INDEX_NAME_AUTOCOMPLETE=telemeta-crem-auto