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

This commit is contained in:
Luke Sneeringer
2014-07-17 14:02:56 -05:00
parent 389c9861d8
commit 7e284e0c4a
6 changed files with 15 additions and 15 deletions

View File

@@ -110,10 +110,10 @@ class Command(NoArgsCommand):
socketio_notification_port = settings.SOCKETIO_NOTIFICATION_PORT
try:
if os.path.exists('/etc/awx/awx.cert') and os.path.exists('/etc/awx/awx.key'):
if os.path.exists('/etc/tower/awx.cert') and os.path.exists('/etc/tower/awx.key'):
print 'Listening on port https://0.0.0.0:' + str(socketio_listen_port)
server = SocketIOServer(('0.0.0.0', socketio_listen_port), TowerSocket(), resource='socket.io',
keyfile='/etc/awx/awx.key', certfile='/etc/awx/awx.cert')
keyfile='/etc/tower/awx.key', certfile='/etc/tower/awx.cert')
else:
print 'Listening on port http://0.0.0.0:' + str(socketio_listen_port)
server = SocketIOServer(('0.0.0.0', socketio_listen_port), TowerSocket(), resource='socket.io')

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

View File

@@ -54,17 +54,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,

View File

@@ -69,7 +69,7 @@ angular.module('AccessHelper', ['RestServices', 'Utilities', 'ngCookies'])
// The license is invalid. Stop the user from logging in.
status = 'alert-danger';
hdr = 'License Error';
msg = '<p>There is a problem with the /etc/awx/license file on your Tower server. Check to make sure Tower can access ' +
msg = '<p>There is a problem with the /etc/tower/license file on your Tower server. Check to make sure Tower can access ' +
'the file.</p>' + purchase_msg;
Alert(hdr, msg, status, null, false, true);
} else if (license.demo !== undefined && license.demo === true) {
@@ -103,4 +103,4 @@ angular.module('AccessHelper', ['RestServices', 'Utilities', 'ngCookies'])
}
};
}
]);
]);

View File

@@ -7,8 +7,8 @@ WSGISocketPrefix /var/run/wsgi
ServerAlias *
DocumentRoot /var/lib/awx/public
SSLEngine on
SSLCertificateFile /etc/awx/awx.cert
SSLCertificateKeyFile /etc/awx/awx.key
SSLCertificateFile /etc/tower/awx.cert
SSLCertificateKeyFile /etc/tower/awx.key
WSGIScriptAlias / /var/lib/awx/wsgi.py
WSGIPassAuthorization On

View File

@@ -13,7 +13,7 @@ from awx import __version__
build_timestamp = os.getenv("BUILD",datetime.datetime.now().strftime('-%Y%m%d%H%M'))
# Paths we'll use later
etcpath = "/etc/awx"
etcpath = "/etc/tower"
homedir = "/var/lib/awx"
sharedir = "/usr/share/awx"
if os.path.exists("/etc/debian_version"):