vbatts/quay
Archived
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

use os.path.join when locating ssl certs

Browse source
This commit is contained in:
Jimmy Zelinskie 2014-12-16 13:19:35 -05:00
parent 79b61e7709
commit 37079315d2
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
buildman/builder.py
View file

@ -44,8 +44,8 @@ def run_build_manager():
if os.environ.get('SSL_CONFIG'): if os.environ.get('SSL_CONFIG'):
logger.debug('Loading SSL cert and key') logger.debug('Loading SSL cert and key')
ssl_context = SSLContext() ssl_context = SSLContext()
ssl_context.load_cert_chain(os.environ.get('SSL_CONFIG') + '/ssl.cert', ssl_context.load_cert_chain(os.path.join(os.environ.get('SSL_CONFIG'), 'ssl.cert'),
os.environ.get('SSL_CONFIG') + '/ssl.key') os.path.join(os.environ.get('SSL_CONFIG'), 'ssl.key'))
server = BuilderServer(app.config['SERVER_HOSTNAME'], dockerfile_build_queue, build_logs, server = BuilderServer(app.config['SERVER_HOSTNAME'], dockerfile_build_queue, build_logs,
user_files, manager_klass) user_files, manager_klass)