Look up DJANGO_ALLOWED_HOSTS env

JiscSD · Apr 13, 2017 · d41c62c · d41c62c
1 parent ceea46f
commit d41c62c
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 9 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -50,10 +50,8 @@ USER archivematica
 RUN env \
 	DJANGO_SETTINGS_MODULE=storage_service.settings.local \
 	DJANGO_SECRET_KEY=12345 \
-	SS_DB_HOST=foobar \
-	SS_DB_USER=foobar \
-	SS_DB_PASSWORD=foobar \
-	SS_DB_NAME=foobar \
+        DJANGO_ALLOWED_HOSTS=127.0.0.1 \
+	SS_DB_URL=mysql://ne:ver@min/d \
 		/src/storage_service/manage.py collectstatic --noinput --clear
 
 EXPOSE 8000

diff --git a/storage_service/storage_service/settings/base.py b/storage_service/storage_service/settings/base.py
@@ -120,7 +120,7 @@ def get_env_variable(var_name):
 ########## SITE CONFIGURATION
 # Hosts/domain names that are valid for this site
 # See https://docs.djangoproject.com/en/1.5/ref/settings/#allowed-hosts
-ALLOWED_HOSTS = []
+ALLOWED_HOSTS = get_env_variable('DJANGO_ALLOWED_HOSTS').split(',')
 ########## END SITE CONFIGURATION
 
 

diff --git a/storage_service/storage_service/settings/production.py b/storage_service/storage_service/settings/production.py
@@ -18,10 +18,6 @@ def get_env_setting(setting):
         error_msg = "Set the %s env variable" % setting
         raise ImproperlyConfigured(error_msg)
 
-########## HOST CONFIGURATION
-# See: https://docs.djangoproject.com/en/1.5/releases/1.5/#allowed-hosts-required-in-production
-ALLOWED_HOSTS = ['*']
-########## END HOST CONFIGURATION
 
 ########## EMAIL CONFIGURATION
 # See: https://docs.djangoproject.com/en/dev/ref/settings/#email-backend