django-repositories/fabric
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

updated fabric allowed hosts

Browse source
This commit is contained in:
Ronny Abraham 2018-11-09 10:16:13 +02:00
parent 8dab351ce6
commit e270402ac9
2 changed files with 14 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
modules/initialize.py
View file

@ -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')

2
share/templates/conf/django/files/local.jinja2
View file

@ -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