Merge pull request #602 from c-mart/multiple-hostname-support

Supporting multiple hostnames for Atmosphere(1) server
cyverse · Apr 5, 2018 · b06865b · b06865b
2 parents 4daba78 + 7ef60ac
commit b06865b
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -25,7 +25,11 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 -->
 
 ## [Unreleased](https://github.com/cyverse/atmosphere/compare/v32-0...HEAD)
+### Added
+ - Support multiple hostnames for Atmosphere(1) server ([#602](https://github.com/cyverse/atmosphere/pull/602))
+
 ## [v32-0](https://github.com/cyverse/atmosphere/compare/v31-1...v32-0) 2018-04-03
+### Changed
 ### Added
   - Include a start date in the resource request api
 

diff --git a/atmosphere/settings/local.py.j2 b/atmosphere/settings/local.py.j2
@@ -242,7 +242,8 @@ SERVER_NAME = SERVER_URL.replace('https://','')
 EMAIL_SUBJECT_PREFIX = "[Django - %s] " % (SERVER_NAME,)
 
 # Prevents warnings
-ALLOWED_HOSTS = [SERVER_NAME, 'localhost']
+ADDITIONAL_ALLOWED_HOSTNAMES = {{ ADDITIONAL_ALLOWED_HOSTNAMES }}
+ALLOWED_HOSTS = [SERVER_NAME, 'localhost'] + ADDITIONAL_ALLOWED_HOSTNAMES
 CSRF_TRUSTED_ORIGINS = ALLOWED_HOSTS
 
 

diff --git a/variables.ini.dist b/variables.ini.dist
@@ -6,6 +6,7 @@ DJANGO_SERVER_URL = # https://www.my-website.com
 VIRTUALENV_PATH =# /path/virtualenv/atmo
 
 [local.py]
+ADDITIONAL_ALLOWED_HOSTNAMES = [] # Additional HOST header values that django will permit in requests
 AUTH_USE_OVERRIDE =  True # Boolean required will override authentication set in __init__.py
 AUTH_MOCK_USER = # testuser
 AUTH_ENABLE_MOCK =  True # Boolean required