fix DEBUG env

diff --git a/app/settings.py b/app/settings.py
index fb52fd83dbdc53f2e36eb94df5c775476a1f61b3..49cfb3c48ba6a447eeb5e9bfcc0418c57dd9f1aa 100644 (file)
--- a/app/settings.py
+++ b/app/settings.py
@@ -45,7 +45,7 @@ TIME_ZONE = 'Europe/Paris'
 
 # Language code for this installation. All choices can be found here:
 # http://www.i18nguy.com/unicode/language-identifiers.html
-LANGUAGE_CODE = 'fr_FR'
+LANGUAGE_CODE = 'fr'
 LANGUAGES = [ ('fr', 'French'),
               ('en', 'English'),
 ]
@@ -163,7 +163,7 @@ INSTALLED_APPS = (
     'quiz',
     'pdfannotator',
     'captcha',
-    'telemeta',
+    # 'telemeta',
 )
 
 TEMPLATE_CONTEXT_PROCESSORS = (

diff --git a/env/debug.env b/env/debug.env
index 77bc2b688288f929dc4b876425495213fc906dc7..4131492b26b670b18d0499e8ba275a25ee5de023 100644 (file)
--- a/env/debug.env
+++ b/env/debug.env
@@ -1,31 +1,7 @@
-## MYSQL DATABASE
+DEBUG=True
 
-ENGINE=django.db.backends.mysql
 MYSQL_ROOT_PASSWORD=mysecretpassword
 MYSQL_DATABASE=teleforma
 MYSQL_USER=teleforma
 MYSQL_PASSWORD=mysecretpassword
-
-## DJANGO
-
-DEBUG=True
-SECRET_KEY=ghv8us258zefoifh7n97dq&w$c((o5rj_$-9d-8j57y_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.
-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=teleforma
-HAYSTACK_INDEX_NAME_AUTOCOMPLETE=teleforma_auto
+DB_PORT=3306

diff --git a/env/prod.env b/env/prod.env
index 733902324000bb81c82d636f7bc0080dc3d29f0c..886325c1178acb09b4f3815133be21538f8a41cf 100644 (file)
--- a/env/prod.env
+++ b/env/prod.env
@@ -1,4 +1,7 @@
+DEBUG=False
+
 MYSQL_ROOT_PASSWORD=mysecretpassword
 MYSQL_DATABASE=teleforma
 MYSQL_USER=teleforma
-MYSQL_PASSWORD=mysecretpassword
\ No newline at end of file
+MYSQL_PASSWORD=mysecretpassword
+DB_PORT=3306

diff --git a/requirements.txt b/requirements.txt
index ca50c1cd329469b90b328f3e65828a7afedda8dd..8bfe1130f6b7b59192f8e62ca9f74719af3c0f01 100644 (file)
--- a/requirements.txt
+++ b/requirements.txt
@@ -142,8 +142,6 @@ sphinx-me==0.2.1
 sqlparse==0.1.10
 stevedore==1.32.0
 texttable==0.8.7
--e git+https://git.parisson.com/git/telemeta.git@2fced3bcac3055830dab4d3d708d89ff0cc7ddb5#egg=Telemeta
-TimeSide==0.5.3
 traitlets==4.3.1
 ua-parser==0.3.6
 Unidecode==0.4.18