diff --git a/modules/initialize.py b/modules/initialize.py index c870284..7db1b83 100644 --- a/modules/initialize.py +++ b/modules/initialize.py @@ -197,15 +197,6 @@ def get_config(branchname): dataobject.project.user = config['project']['user'] dataobject.project.group = config['project']['group'] - dataobject.project.allowedhosts = list() - _allowed = getattr(dataobject.project, 'allowedhosts') - _allowed.append(dataobject.project.extendedname) - _allowed.append(dataobject.project.host) - - if 'allowed_hosts' in config['project']: - for allowed in config['project']['allowed_hosts']: - _allowed.append(allowed) - dataobject.project.sudo = config['project']['sudo'] # @@ -234,6 +225,19 @@ def get_config(branchname): dataobject.project.django.settings_folder = \ config['django']['settings_folder'] + # + # allowed_hosts are the ip addresses and hostnames + # that this instance is allowed to run on + + dataobject.project.django.allowedhosts = list() + _allowed = getattr(dataobject.project.django, 'allowedhosts') + _allowed.append(dataobject.project.extendedname) + _allowed.append(dataobject.project.host) + + if 'allowed_hosts' in config['django']: + for allowed in config['django']['allowed_hosts']: + _allowed.append(allowed) + dataobject.addbranch('paths') dataobject.paths.addbranch('project') diff --git a/share/templates/conf/django/files/local.jinja2 b/share/templates/conf/django/files/local.jinja2 index 76255b9..d59b8e1 100644 --- a/share/templates/conf/django/files/local.jinja2 +++ b/share/templates/conf/django/files/local.jinja2 @@ -70,7 +70,7 @@ USE_DEBUG_TOOLBAR = DEBUG # allow template debug outputs on {{ project_branch }} environment INTERNAL_IPS = ['127.0.0.1', '127.0.0.2', '127.0.0.3', ] -ALLOWED_HOSTS = configuration.project.allowedhosts +ALLOWED_HOSTS = configuration.project.django.allowedhosts # ----------------------------------------- # Debug logging to the console