From 3145cb4231ce578ae7e7bb0e16d70c875e3dc4f0 Mon Sep 17 00:00:00 2001 From: Eric Riggs Date: Thu, 26 Apr 2018 02:18:32 -0400 Subject: [PATCH] Add django-environ and use it to set ALLOWED_HOSTS. Signed-off-by: Eric Riggs --- docker/entrypoint.sh | 1 + mayan/settings/base.py | 6 +++++- requirements/base.txt | 1 + setup.py | 1 + 4 files changed, 8 insertions(+), 1 deletion(-) diff --git a/docker/entrypoint.sh b/docker/entrypoint.sh index 30b0dd5634..d1cc92cc71 100755 --- a/docker/entrypoint.sh +++ b/docker/entrypoint.sh @@ -6,6 +6,7 @@ INSTALL_FLAG=/var/lib/mayan/media/system/SECRET_KEY export MAYAN_MEDIA_ROOT=/var/lib/mayan export MAYAN_GUNICORN_WORKERS=${MAYAN_GUNICORN_WORKERS:-3} +export MAYAN_ALLOWED_HOSTS=* chown mayan:mayan /var/lib/mayan -R diff --git a/mayan/settings/base.py b/mayan/settings/base.py index f0127b19a4..2b37b1bbea 100644 --- a/mayan/settings/base.py +++ b/mayan/settings/base.py @@ -16,10 +16,14 @@ import sys from django.utils.translation import ugettext_lazy as _ +import environ + import mayan from .literals import DEFAULT_SECRET_KEY, SECRET_KEY_FILENAME, SYSTEM_DIR +env = environ.Env() + # Build paths inside the project like this: os.path.join(BASE_DIR, ...) BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) @@ -33,7 +37,7 @@ SECRET_KEY = DEFAULT_SECRET_KEY # SECURITY WARNING: don't run with debug turned on in production! DEBUG = False -ALLOWED_HOSTS = ['127.0.0.1', 'localhost', '[::1]'] +ALLOWED_HOSTS = env.list('MAYAN_ALLOWED_HOSTS', default=['127.0.0.1', 'localhost', '[::1]']) # Application definition diff --git a/requirements/base.txt b/requirements/base.txt index a4df3247bf..76f6f26b60 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -11,6 +11,7 @@ django-colorful==1.2 django-compressor==2.2 django-cors-headers==2.2.0 django-downloadview==1.9 +django-environ==0.4.4 django-formtools==2.1 django-pure-pagination==0.3.0 django-mathfilters==0.4.0 diff --git a/setup.py b/setup.py index 5e1dc60b2e..2c457474d3 100644 --- a/setup.py +++ b/setup.py @@ -68,6 +68,7 @@ django-colorful==1.2 django-compressor==2.2 django-cors-headers==2.2.0 django-downloadview==1.9 +django-environ==0.4.4 django-formtools==2.1 django-pure-pagination==0.3.0 django-mathfilters==0.4.0