updated fabric allowed hosts
This commit is contained in:
parent
8dab351ce6
commit
e270402ac9
2 changed files with 14 additions and 10 deletions
|
|
@ -197,15 +197,6 @@ def get_config(branchname):
|
||||||
dataobject.project.user = config['project']['user']
|
dataobject.project.user = config['project']['user']
|
||||||
dataobject.project.group = config['project']['group']
|
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']
|
dataobject.project.sudo = config['project']['sudo']
|
||||||
|
|
||||||
#
|
#
|
||||||
|
|
@ -234,6 +225,19 @@ def get_config(branchname):
|
||||||
dataobject.project.django.settings_folder = \
|
dataobject.project.django.settings_folder = \
|
||||||
config['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.addbranch('paths')
|
||||||
|
|
||||||
dataobject.paths.addbranch('project')
|
dataobject.paths.addbranch('project')
|
||||||
|
|
|
||||||
|
|
@ -70,7 +70,7 @@ USE_DEBUG_TOOLBAR = DEBUG
|
||||||
# allow template debug outputs on {{ project_branch }} environment
|
# allow template debug outputs on {{ project_branch }} environment
|
||||||
INTERNAL_IPS = ['127.0.0.1', '127.0.0.2', '127.0.0.3', ]
|
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
|
# Debug logging to the console
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue