From 46999016f2f9eba61f64b02061435002ec6b2697 Mon Sep 17 00:00:00 2001
From: Guillaume Pellerin <guillaume.pellerin@parisson.com>
Date: Wed, 23 Jun 2021 14:13:33 +0200
Subject: [PATCH] update env for staging / prod

---
 app/settings.py    |  6 +++---
 docker-compose.yml |  2 +-
 env/prod.yml       |  4 +++-
 env/staging.yml    | 44 ++++++++++++++++++++++++++++++++++++++++----
 4 files changed, 47 insertions(+), 9 deletions(-)

diff --git a/app/settings.py b/app/settings.py
index f4929aa5..0bde0828 100644
--- a/app/settings.py
+++ b/app/settings.py
@@ -235,12 +235,12 @@ LOGIN_URL = '/login/'
 LOGIN_REDIRECT_URL = reverse_lazy('teleforma-desk')
 SESSION_EXPIRE_AT_BROWSER_CLOSE = False
 
-EMAIL_HOST = 'localhost'
+EMAIL_HOST = 'angus.parisson.com'
 DEFAULT_FROM_EMAIL = 'crfpa@pre-barreau.com'
 SERVER_EMAIL = 'crfpa@pre-barreau.com'
 EMAIL_SUBJECT_PREFIX = '[' + TELEMETA_ORGANIZATION + '] '
-if DEBUG:
-    EMAIL_BACKEND = 'django.core.mail.backends.console.EmailBackend'
+#if DEBUG:
+#    EMAIL_BACKEND = 'django.core.mail.backends.console.EmailBackend'
 
 
 
diff --git a/docker-compose.yml b/docker-compose.yml
index 5b1fe771..1469252d 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -18,7 +18,7 @@ services:
       - ./var/log/app:/var/log/app
       - ./var/log/uwsgi:/var/log/uwsgi
     ports:
-      - "9001:8000"
+      - "9000:8000"
     links:
       - postgres
       - redis
diff --git a/env/prod.yml b/env/prod.yml
index 1521e472..d6ec096b 100644
--- a/env/prod.yml
+++ b/env/prod.yml
@@ -13,6 +13,8 @@ services:
     volumes:
       - /mnt/crfpa-videos:/mnt/crfpa-videos
       - /mnt/crfpa-scripts:/mnt/crfpa-scripts
+    ports:
+      - "9003:8000"
   
   channels:
     build:
@@ -27,7 +29,7 @@ services:
       - ./teleforma/:/srv/src/teleforma/teleforma
       - ./var/log/app:/var/log/app
     ports:
-      - "9002:8000"
+      - "9004:8000"
     links:
       - postgres
       - redis
diff --git a/env/staging.yml b/env/staging.yml
index 93b173e4..435e1852 100644
--- a/env/staging.yml
+++ b/env/staging.yml
@@ -1,8 +1,44 @@
-version: '3.6'
+version: '3'
+
 services:
   app:
+    build:
+      context: .
+      args:
+        dev: 0
+    command: /bin/sh /srv/app/wsgi.sh
+    restart: unless-stopped
+    env_file:
+      - env/staging.env
+    volumes:
+      - /mnt/crfpa-videos:/mnt/crfpa-videos
+      - /mnt/crfpa-scripts:/mnt/crfpa-scripts
+    ports:
+      - "9001:8000"
+  
+  channels:
+    build:
+      context: .
+      args:
+        dev: 0
+    command: /bin/sh /srv/app/asgi.sh
     volumes:
-      - ./var/media:${MEDIA_PATH}
-      - /srv/ftp:${FTP_PATH}
+      - ./app/:/srv/app
+      - ./bin:/srv/bin
+      - ./lib:/srv/lib
+      - ./teleforma/:/srv/src/teleforma/teleforma
+      - ./var/log/app:/var/log/app
+    ports:
+      - "9002:8000"
+    links:
+      - postgres
+      - redis
     env_file:
-      - 'env/staging.env'
+      - env/staging.env
+
+
+volumes:
+    app:
+    channels:
+    postgres:
+    redis:
-- 
2.39.5