Merge pull request #192 from coreos-inc/sqlssl

Allow SSL cert for the database to be configured
This commit is contained in:
Jimmy Zelinskie 2015-06-29 13:33:31 -04:00
commit 756d6784ca
8 changed files with 45 additions and 12 deletions

View file

@ -243,7 +243,9 @@ class SuperUserConfigFile(ApiResource):
if not filename in CONFIG_FILENAMES:
abort(404)
if SuperUserPermission().can():
# Note: This method can be called before the configuration exists
# to upload the database SSL cert.
if not CONFIG_PROVIDER.yaml_exists() or SuperUserPermission().can():
uploaded_file = request.files['file']
if not uploaded_file:
abort(400)