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

@ -35,15 +35,11 @@ class SuperUserConfig(ApiResource):
'description': 'Updates the YAML config file',
'required': [
'config',
'hostname'
],
'properties': {
'config': {
'type': 'object'
},
'hostname': {
'type': 'string'
},
'password': {
'type': 'string'
},
@ -66,10 +62,9 @@ class SuperUserConfig(ApiResource):
# Note: This method is called to set the database configuration before super users exists,
# so we also allow it to be called if there is no valid registry configuration setup.
config_object = request.get_json()['config']
hostname = request.get_json()['hostname']
# Add any enterprise defaults missing from the config.
add_enterprise_config_defaults(config_object, app.config['SECRET_KEY'], hostname)
add_enterprise_config_defaults(config_object, app.config['SECRET_KEY'])
# Write the configuration changes to the config override file.
config_provider.save_config(config_object)

View file

@ -278,7 +278,6 @@ const templateUrl = require('./setup.html');
'config': {
'DB_URI': $scope.databaseUri
},
'hostname': window.location.host
};
if ($scope.currentState.hasDatabaseSSLCert) {