From 74ed11a9ae65b10d6078fa4c441c42627219155d Mon Sep 17 00:00:00 2001 From: Guillaume Pellerin Date: Wed, 23 Jun 2021 18:52:45 +0200 Subject: [PATCH] fix debug_toolbar, add prod domain --- .gitignore | 2 +- app/settings.py | 1 + app/urls.py | 4 +++- env/prod.env | 4 ++-- env/prod.yml | 4 ++++ 5 files changed, 11 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 19b08036..45bb6796 100644 --- a/.gitignore +++ b/.gitignore @@ -28,4 +28,4 @@ pip-log.txt #python venv py_env -env/prod.env +prod.env diff --git a/app/settings.py b/app/settings.py index a606179b..d11fc62e 100644 --- a/app/settings.py +++ b/app/settings.py @@ -381,6 +381,7 @@ POSTMAN_SHOW_USER_AS = show_user_as ALLOWED_HOSTS = ['localhost', 'crfpa.dockdev.pilotsystems.net', 'staging.docker.e-learning.crfpa.pre-barreau.parisson.com', + 'e-learning.crfpa.pre-barreau.com', ] JAZZMIN_SETTINGS = { diff --git a/app/urls.py b/app/urls.py index aef93771..e601f98d 100644 --- a/app/urls.py +++ b/app/urls.py @@ -1,7 +1,6 @@ # -*- coding: utf-8 -*- import os -import debug_toolbar from django.conf.urls import include, url # Uncomment the next two lines to enable the admin: from django.contrib import admin @@ -14,6 +13,9 @@ js_info_dict = ['teleforma'] DEBUG_ENV = os.environ.get('DEBUG') == 'True' +if DEBUG_ENV: + import debug_toolbar + urlpatterns = [ # Example: # (r'^sandbox/', include('sandbox.foo.urls')), diff --git a/env/prod.env b/env/prod.env index 90cb7436..2b8c39e5 100644 --- a/env/prod.env +++ b/env/prod.env @@ -1,7 +1,7 @@ -DEBUG=True +DEBUG=False DB_PORT=5432 DB_HOST=postgres -POSTGRES_PASSWORD=mysecretpassword +POSTGRES_PASSWORD=EtOdlerlOt8ob POSTGRES_DATABASE=teleforma POSTGRES_USER=teleforma diff --git a/env/prod.yml b/env/prod.yml index d6ec096b..e3a967c2 100644 --- a/env/prod.yml +++ b/env/prod.yml @@ -36,6 +36,10 @@ services: env_file: - env/prod.env + postgres: + image: postgres:13 + env_file: + - env/prod.env volumes: app: -- 2.39.5