From 37079315d25ce70abff79c4fc7f5481b764dff27 Mon Sep 17 00:00:00 2001 From: Jimmy Zelinskie Date: Tue, 16 Dec 2014 13:19:35 -0500 Subject: [PATCH] use os.path.join when locating ssl certs --- buildman/builder.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/buildman/builder.py b/buildman/builder.py index 3e14db3eb..4f0d8f2d7 100644 --- a/buildman/builder.py +++ b/buildman/builder.py @@ -44,8 +44,8 @@ def run_build_manager(): if os.environ.get('SSL_CONFIG'): logger.debug('Loading SSL cert and key') ssl_context = SSLContext() - ssl_context.load_cert_chain(os.environ.get('SSL_CONFIG') + '/ssl.cert', - os.environ.get('SSL_CONFIG') + '/ssl.key') + ssl_context.load_cert_chain(os.path.join(os.environ.get('SSL_CONFIG'), 'ssl.cert'), + os.path.join(os.environ.get('SSL_CONFIG'), 'ssl.key')) server = BuilderServer(app.config['SERVER_HOSTNAME'], dockerfile_build_queue, build_logs, user_files, manager_klass)