fix debug_toolbar, add prod domain

diff --git a/.gitignore b/.gitignore
index 19b08036d27403c6476acbf2d61940d449e54be8..45bb679638fcfae794791de6899815fb314c1746 100644 (file)
--- 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 a606179b74d7981dd42664dfb4407153df8d8f0d..d11fc62e478c5aa6e512b65c7d86cb5aec055b6d 100644 (file)
--- 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 aef93771563bd44148946f4472b630d325408aeb..e601f98dd207734c4f089f131212beb70f39c44a 100644 (file)
--- 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 90cb743654d3c7e15618a63828a7875ac7168844..2b8c39e5f37a7e3b4daa239c8fe47828e2051130 100644 (file)
--- 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 d6ec096b1ab719d35a78b621529c46295ac31140..e3a967c2a46bff710a22ee21cee9a0df8051fdfa 100644 (file)
--- 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: