update env for staging / prod

diff --git a/app/settings.py b/app/settings.py
index f4929aa5ba323f1917f85757eb40ae6488a1f0ca..0bde0828db97693fdfaee816b7b58a6dce165cf1 100644 (file)
--- 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 5b1fe771bafd99f64906380099cd30216dbbea59..1469252d9bef34e5cb3e8594ab1e9a45f9dc0e87 100644 (file)
--- 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 1521e472e6859577261a5f8897efd58dd7877c5b..d6ec096b1ab719d35a78b621529c46295ac31140 100644 (file)
--- 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 93b173e4ed74a21554620023ec7faba446344f28..435e1852e3bb3df70dd087bcb4f55caa7aaefa17 100644 (file)
--- 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: