From c1a56aff4e49a1c7ae0382c792dab1a0ff944d4c Mon Sep 17 00:00:00 2001 From: Guillaume Pellerin Date: Tue, 25 May 2021 16:07:54 +0200 Subject: [PATCH] fix DEBUG env --- app/settings.py | 4 ++-- env/debug.env | 28 ++-------------------------- env/prod.env | 5 ++++- requirements.txt | 2 -- 4 files changed, 8 insertions(+), 31 deletions(-) diff --git a/app/settings.py b/app/settings.py index fb52fd83..49cfb3c4 100644 --- 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 77bc2b68..4131492b 100644 --- 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 73390232..886325c1 100644 --- 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 ca50c1cd..8bfe1130 100644 --- 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 -- 2.39.5