# HG changeset patch # User Tero Marttila # Date 1499115615 -10800 # Node ID 7b87e8ed2faa6176ba1bf72954db6e9d87021d10 # Parent 5886ca11cae41508eecfb867ec13803d94075669 rename Docker envs to DJANGO_* diff -r 5886ca11cae4 -r 7b87e8ed2faa Dockerfile --- a/Dockerfile Tue Jul 04 00:00:03 2017 +0300 +++ b/Dockerfile Tue Jul 04 00:00:15 2017 +0300 @@ -26,7 +26,7 @@ VOLUME /srv/qmsk-www-pages ENV \ - QMSK_WWW_SERVER_NAME= \ - QMSK_WWW_SERVER_ALIAS= \ - QMSK_WWW_SECRET= \ + DJANGO_SERVER_NAME= \ + DJANGO_SERVER_ALIAS= \ + DJANGO_SECRET= \ QMSK_WWW_PAGES_PATH=/srv/qmsk-www-pages diff -r 5886ca11cae4 -r 7b87e8ed2faa docker/production.py --- a/docker/production.py Tue Jul 04 00:00:03 2017 +0300 +++ b/docker/production.py Tue Jul 04 00:00:15 2017 +0300 @@ -7,10 +7,10 @@ DEBUG = False ALLOWED_HOSTS = [ - os.environ['QMSK_WWW_SERVER_NAME'], -] + os.environ.get('QMSK_WWW_SERVER_ALIAS').split() + os.environ['DJANGO_SERVER_NAME'], +] + os.environ.get('DJANGO_SERVER_ALIAS').split() -SECRET_KEY = os.environ['QMSK_WWW_SECRET'] +SECRET_KEY = os.environ['DJANGO_SECRET'] ## qmsk.pages QMSK_PAGES_DIR = os.environ['QMSK_WWW_PAGES_PATH']