From 5ab04bbd3a9bc24407e6e1a9cfbfa6e890edbf7f Mon Sep 17 00:00:00 2001 From: Erich Hasl Date: Mon, 3 Jul 2017 22:58:57 +0200 Subject: [PATCH] allow multiple allowed domains --- jdav_web/jdav_web/settings.py | 2 +- jdav_web/mailer/mailutils.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/jdav_web/jdav_web/settings.py b/jdav_web/jdav_web/settings.py index f8ce049..8a3e72b 100644 --- a/jdav_web/jdav_web/settings.py +++ b/jdav_web/jdav_web/settings.py @@ -28,7 +28,7 @@ SECRET_KEY = os.environ.get('DJANGO_SECRET_KEY', # SECURITY WARNING: don't run with debug turned on in production! DEBUG = True -ALLOWED_HOSTS = [os.environ.get('DJANGO_ALLOWED_HOST', ''),] +ALLOWED_HOSTS = os.environ.get('DJANGO_ALLOWED_HOST', '').split(",") # Define media paths e.g. for image storage MEDIA_ROOT = os.path.join((os.path.join(BASE_DIR, os.pardir)), "media") diff --git a/jdav_web/mailer/mailutils.py b/jdav_web/mailer/mailutils.py index 4564492..d73de27 100644 --- a/jdav_web/mailer/mailutils.py +++ b/jdav_web/mailer/mailutils.py @@ -4,7 +4,7 @@ import os NOT_SENT, SENT, PARTLY_SENT = 0, 1, 2 -HOST = os.environ.get('DJANGO_ALLOWED_HOST', 'localhost:8000') +HOST = os.environ.get('DJANGO_ALLOWED_HOST', 'localhost:8000').split(",")[0] def send(subject, content, sender, recipients, reply_to=None,