From fea31271d2b27948d4f463315c7061162336fd76 Mon Sep 17 00:00:00 2001 From: Luke Sneeringer Date: Mon, 26 Jan 2015 16:11:52 -0600 Subject: [PATCH] Move cert and key files to tower.cert and tower.key. --- awx/main/management/commands/run_socketio_service.py | 4 ++-- config/awx-httpd-443.conf | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/awx/main/management/commands/run_socketio_service.py b/awx/main/management/commands/run_socketio_service.py index ce2ec197e7..0788217a21 100644 --- a/awx/main/management/commands/run_socketio_service.py +++ b/awx/main/management/commands/run_socketio_service.py @@ -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') diff --git a/config/awx-httpd-443.conf b/config/awx-httpd-443.conf index bf86166957..6923a2bc0a 100644 --- a/config/awx-httpd-443.conf +++ b/config/awx-httpd-443.conf @@ -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