Skip to content
Snippets Groups Projects
Verified Commit 04fce48d authored by Tom Teichler's avatar Tom Teichler :beers:
Browse files

Merge branch 'master' into 484-missing-dependency-python-gnupg

parents 4a023c66 1ad09b25
No related branches found
No related tags found
1 merge request!673Resolve "Missing dependency python-gnupg"
Pipeline #18500 passed
......@@ -18,6 +18,7 @@ Fixed
~~~~~
* Add missing dependency python-gnupg
* Add missing AWS options to ignore invalid ssl certificates
`2.0b2` - 2021-06-15
--------------------
......
......@@ -853,6 +853,8 @@ if _settings.get("storage.type", "").lower() == "s3":
AWS_S3_GZIP = _settings.get("storage.s3.gzip", True)
AWS_S3_SIGNATURE_VERSION = _settings.get("storage.s3.signature_version", None)
AWS_S3_FILE_OVERWRITE = _settings.get("storage.s3.file_overwrite", False)
AWS_S3_VERIFY = _settings.get("storage.s3.verify", True)
AWS_S3_USE_SSL = _settings.get("storage.s3.use_ssl", True)
else:
DEFAULT_FILE_STORAGE = "titofisto.TitofistoStorage"
TITOFISTO_TIMEOUT = 10 * 60
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment