Merge remote-tracking branch 'origin' into crem

Conflicts:
	telemeta/locale
	telemeta/pages

diff --cc app/settings.py
Simple merge

diff --cc docker-compose.yml
Simple merge

diff --cc env/debug.env
index 7059bd06039031fd5a7922143818d66afa7a6cdf,38984ec5aaed27a00572d5862443af7f556ba4cd..8ed4c1c64d990841f9116e1d12137b44cebd3903
--- 1/env/debug.env
--- 2/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 7059bd06039031fd5a7922143818d66afa7a6cdf,933f0f2c64e605dd81fc582658fd65b475389d50..9f0f7bfa21a7e4d0e01da90b3ea4fdac342c5026
--- 1/env/prod.env
--- 2/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_INDEX_NAME=telemeta
 -HAYSTACK_INDEX_NAME_AUTOCOMPLETE=telemeta_auto
+ 
+ ## 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-crem
++HAYSTACK_INDEX_NAME_AUTOCOMPLETE=telemeta-crem-auto