TTMK/web2.0-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Try other yml syntax

Browse Source
This commit is contained in:
Aarni Halinen
2019-10-08 19:42:49 +03:00
parent 34a4f027f5
commit d3c50dc608
2 changed files with 12 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sikweb/settings-sample-prod.py
+1 -1
View File
@@ -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
stack-compose.yml
+11 -15
View File
@@ -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: