Move cert and key files to tower.cert and tower.key.

This commit is contained in:
Luke Sneeringer
2015-01-26 16:11:52 -06:00
parent 89eeadacdb
commit fea31271d2
2 changed files with 4 additions and 4 deletions

View File

@@ -156,10 +156,10 @@ class Command(NoArgsCommand):
socketio_notification_port = settings.SOCKETIO_NOTIFICATION_PORT
try:
if os.path.exists('/etc/tower/awx.cert') and os.path.exists('/etc/tower/awx.key'):
if os.path.exists('/etc/tower/tower.cert') and os.path.exists('/etc/tower/tower.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/tower/awx.key', certfile='/etc/tower/awx.cert')
keyfile='/etc/tower/tower.key', certfile='/etc/tower/tower.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

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