From d3c50dc608f535142a23a5d112b7a12efdbc9514 Mon Sep 17 00:00:00 2001
From: Aarni Halinen <aarni.halinen@gmail.com>
Date: Tue, 8 Oct 2019 19:42:49 +0300
Subject: [PATCH] Try other yml syntax

---
 sikweb/settings-sample-prod.py |  2 +-
 stack-compose.yml              | 26 +++++++++++---------------
 2 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/sikweb/settings-sample-prod.py b/sikweb/settings-sample-prod.py
index 78ba253..6920a2d 100644
--- a/sikweb/settings-sample-prod.py
+++ b/sikweb/settings-sample-prod.py
@@ -27,7 +27,7 @@ GOOGLE_RECAPTCHA_SITE_KEY = "YOUR-PUBLIC-KEY"
 GOOGLE_RECAPTCHA_SECRET_KEY = "YOUR-PRIVATE-KEY"
 
 # Email settings (more settings in base.py)
-EMAIL_HOST_USER = os.getenv('EMAIL_HOST', '<gmailtunnarisi>@gmail.com')
+EMAIL_HOST_USER = 'sikviestinta@gmail.com'
 EMAIL_HOST_PASSWORD = os.getenv('EMAIL_PASSWD', '<gmail_passu>')
 DEFAULT_EMAIL_FROM = 'SIK Viestintä <sikviestinta@gmail.com>'
 ENABLE_AUTOMATIC_EMAILS = True
diff --git a/stack-compose.yml b/stack-compose.yml
index 453d18d..41fd1be 100644
--- a/stack-compose.yml
+++ b/stack-compose.yml
@@ -3,9 +3,9 @@ services:
   db:
     image: postgres
     environment:
-      POSTGRES_USER: /run/secrets/DJANGO_DB_USER
-      POSTGRES_PASSWORD: /run/secrets/DJANGO_DB_PASSWD
-      POSTGRES_DB: /run/secrets/DJANGO_DB_NAME
+      - POSTGRES_USER=/run/secrets/DJANGO_DB_USER
+      - POSTGRES_PASSWORD=/run/secrets/DJANGO_DB_PASSWD
+      - POSTGRES_DB=/run/secrets/DJANGO_DB_NAME
     ports:
       - 5432:5432
     volumes:
@@ -20,20 +20,18 @@ services:
     ports:
       - 8000:8000
     environment:
-      SECRET_KEY: /run/secrets/DJANGO_SECRET_KEY
-      TG_BOT_TOKEN: /run/secrets/DJANGO_TG_BOT_TOKEN
-      EMAIL_HOST: /run/secrets/DJANGO_EMAIL_HOST
-      EMAIL_PASSWD: /run/secrets/DJANGO_EMAIL_PASSWD
-      DB_NAME: /run/secrets/DJANGO_DB_NAME
-      DB_USER: /run/secrets/DJANGO_DB_USER
-      DB_PASSWORD: /run/secrets/DJANGO_DB_PASSWD
-      DB_HOST: db
-      DB_PORT: 5432
+      - SECRET_KEY=/run/secrets/DJANGO_SECRET_KEY
+      - TG_BOT_TOKEN=/run/secrets/DJANGO_TG_BOT_TOKEN
+      - EMAIL_PASSWD=/run/secrets/DJANGO_EMAIL_PASSWD
+      - DB_NAME=/run/secrets/DJANGO_DB_NAME
+      - DB_USER=/run/secrets/DJANGO_DB_USER
+      - DB_PASSWORD=/run/secrets/DJANGO_DB_PASSWD
+      - DB_HOST=db
+      - DB_PORT=5432
 
     secrets:
       - DJANGO_SECRET_KEY
       - DJANGO_TG_BOT_TOKEN
-      - DJANGO_EMAIL_HOST
       - DJANGO_EMAIL_PASSWD
       - DJANGO_DB_NAME
       - DJANGO_DB_USER
@@ -43,8 +41,6 @@ secrets:
     external: true
   DJANGO_TG_BOT_TOKEN:
     external: true
-  DJANGO_EMAIL_HOST:
-    external: true
   DJANGO_EMAIL_PASSWD:
     external: true
   DJANGO_DB_NAME: