External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-19 14:57:39 -02:30
Code Issues Packages Projects Releases Wiki Activity

Make development settings honor conf.d

Browse Source
This commit is contained in:
Luke Sneeringer
2014-09-30 13:05:38 -05:00
parent e43488467e
commit 66dc2df8c3
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
awx/settings/development.py
View File

@@ -46,7 +46,10 @@ if 'django_jenkins' in INSTALLED_APPS:
os.path.join(BASE_DIR, 'ui/static/lib/ansible'),] os.path.join(BASE_DIR, 'ui/static/lib/ansible'),]
# If there is an `/etc/tower/settings.py`, include it. # If there is an `/etc/tower/settings.py`, include it.
# If there is a `/etc/tower/conf.d/*.py`, include them.
include(optional('/etc/tower/settings.py'), scope=locals()) include(optional('/etc/tower/settings.py'), scope=locals())
include(optional('/etc/tower/conf.d/*.py'), scope=locals())
# If any local_*.py files are present in awx/settings/, use them to override # If any local_*.py files are present in awx/settings/, use them to override
# default settings for development. If not present, we can still run using # default settings for development. If not present, we can still run using