Merge pull request #3236 from quay/small-fixes

Setup reroutes when complete, fix gunicorn healthcheck
This commit is contained in:
Joseph Schorr 2018-09-04 16:35:57 -04:00 committed by GitHub
commit 1953cfcd6e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 10 additions and 14 deletions

View file

@ -6,7 +6,7 @@ def generate_secret_key():
return str(cryptogen.getrandbits(256))
def add_enterprise_config_defaults(config_obj, current_secret_key, hostname):
def add_enterprise_config_defaults(config_obj, current_secret_key):
""" Adds/Sets the config defaults for enterprise registry config. """
# These have to be false.
config_obj['TESTING'] = False
@ -81,9 +81,6 @@ def add_enterprise_config_defaults(config_obj, current_secret_key, hostname):
config_obj['LOG_ARCHIVE_LOCATION'] = 'default'
if not 'SERVER_HOSTNAME' in config_obj:
config_obj['SERVER_HOSTNAME'] = hostname
# Misc configuration.
config_obj['PREFERRED_URL_SCHEME'] = config_obj.get('PREFERRED_URL_SCHEME', 'http')
config_obj['ENTERPRISE_LOGO_URL'] = config_obj.get(