External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-18 06:47:41 -02:30
Code Issues Packages Projects Releases Wiki Activity

Theoretical move from /etc/awx/ to /etc/tower/.

Browse Source
This commit is contained in:
Luke Sneeringer
2014-07-17 14:02:56 -05:00
parent 0f67f6d57c
commit 3b45252039
5 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
awx/settings/development.py
View File

@@ -47,8 +47,8 @@ if 'django_jenkins' in INSTALLED_APPS:
JSHINT_CHECKED_FILES = [os.path.join(BASE_DIR, 'ui/static/js'),
os.path.join(BASE_DIR, 'ui/static/lib/ansible'),]
# If there is an `/etc/awx/settings.py`, include it.
include(optional('/etc/awx/settings.py'), scope=locals())
# If there is an `/etc/tower/settings.py`, include it.
include(optional('/etc/tower/settings.py'), scope=locals())
# 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

12
awx/settings/production.py
View File

@@ -55,17 +55,17 @@ LOGGING['handlers']['rotating_file'] = {
}
# Load settings from any .py files in the global conf.d directory specified in
# the environment, defaulting to /etc/awx/conf.d/.
settings_dir = os.environ.get('AWX_SETTINGS_DIR', '/etc/awx/conf.d/')
# the environment, defaulting to /etc/tower/conf.d/.
settings_dir = os.environ.get('AWX_SETTINGS_DIR', '/etc/tower/conf.d/')
settings_files = os.path.join(settings_dir, '*.py')
# Load remaining settings from the global settings file specified in the
# environment, defaulting to /etc/awx/settings.py.
# environment, defaulting to /etc/tower/settings.py.
settings_file = os.environ.get('AWX_SETTINGS_FILE',
'/etc/awx/settings.py')
'/etc/tower/settings.py')
# Attempt to load settings from /etc/awx/settings.py first, followed by
# /etc/awx/conf.d/*.py.
# Attempt to load settings from /etc/tower/settings.py first, followed by
# /etc/tower/conf.d/*.py.
try:
include(
settings_file,