diff --git a/deploy/nginx/sites-available/pedasi b/deploy/nginx/sites-available/pedasi index 59f59e4f2c32cf899f03f299928173aff816a5a7..fa280989285d76613702afb3dda2b1e0dd6db0b9 100644 --- a/deploy/nginx/sites-available/pedasi +++ b/deploy/nginx/sites-available/pedasi @@ -1,5 +1,5 @@ server { - listen 80; + listen 80 default_server; server_name _; merge_slashes off; diff --git a/pedasi/settings.py b/pedasi/settings.py index 85512f8c20d97a3ebf3acf11b6701f0715fbbb3c..0da9dee2d1286fd6a38a5bcb0e37436e9fb89806 100644 --- a/pedasi/settings.py +++ b/pedasi/settings.py @@ -26,6 +26,9 @@ DEBUG Run the server in debug mode? Default is 'false'. +ALLOWED_HOSTS + List of hostnames on which the server is permitted to run + DATABASE_URL URL to default SQL database - in `dj-database-url <https://github.com/kennethreitz/dj-database-url>`_ format. Default is SQLite3 'db.sqlite3' in project root directory. @@ -41,7 +44,7 @@ import os from django.urls import reverse_lazy -from decouple import config +from decouple import config, Csv import dj_database_url import mongoengine @@ -54,17 +57,9 @@ SECRET_KEY = config('SECRET_KEY') # SECURITY WARNING: don't run with debug turned on in production! DEBUG = config('DEBUG', default=False, cast=bool) -if DEBUG: - ALLOWED_HOSTS = [ - '*', - ] - -else: - ALLOWED_HOSTS = [ - 'localhost', - 'pedasi-dev.eastus.cloudapp.azure.com', - ] - +ALLOWED_HOSTS = config('ALLOWED_HOSTS', + cast=Csv(), + default='*' if DEBUG else '127.0.0.1,localhost.localdomain,localhost') # Application definition