Merge tag 'debian/1.4.2-1_swh1' into debian/buster-swh

PKG-INFO

 Metadata-Version: 2.1
 Name: swh.deposit
-Version: 1.4.1
+Version: 1.4.2
 Summary: Software Heritage Deposit Server
 Home-page: https://forge.softwareheritage.org/source/swh-deposit/
 Author: Software Heritage developers

debian/changelog

-swh-deposit (1.4.1-1~swh1~bpo10+1) buster-swh; urgency=medium
+swh-deposit (1.4.2-1~swh1) unstable-swh; urgency=medium
 
-  * Rebuild for buster-swh
+  * New upstream release 1.4.2     - (tagged by Antoine R. Dumont
+    (@ardumont) <ardumont@softwareheritage.org> on 2023-11-23 12:14:27
+    +0100)
+  * Upstream changes:     - v1.4.2     - settings.production: Allow
+    extra azure configuration
 
- -- Software Heritage autobuilder (on jenkins-debian1) <jenkins@jenkins-debian1.internal.softwareheritage.org>  Mon, 20 Nov 2023 14:00:55 +0000
+ -- Software Heritage autobuilder (on jenkins-debian1) <jenkins@jenkins-debian1.internal.softwareheritage.org>  Thu, 23 Nov 2023 11:20:34 +0000
 
 swh-deposit (1.4.1-1~swh1) unstable-swh; urgency=medium
 

swh.deposit.egg-info/PKG-INFO

 Metadata-Version: 2.1
 Name: swh.deposit
-Version: 1.4.1
+Version: 1.4.2
 Summary: Software Heritage Deposit Server
 Home-page: https://forge.softwareheritage.org/source/swh-deposit/
 Author: Software Heritage developers

swh/deposit/settings/production.py

@@ -123,15 +123,27 @@ if cfg_azure:
                 f"Production: invalid configuration; missing {key} config entry."
             )
 
+    # Default options
+    options = dict(
+        azure_container=cfg_azure["container_name"],
+        connection_string=cfg_azure["connection_string"],
+    )
+
+    # Which may be enhanced with some extra options, lookup "object_parameters" in
+    # https://django-storages.readthedocs.io/en/latest/backends/azure.html
+    object_parameters = {}
+    for optional_config_key in ["content_type", "content_disposition"]:
+        if optional_config_key in cfg_azure:
+            object_parameters[optional_config_key] = cfg_azure[optional_config_key]
+
+    options.update(dict(object_parameters=object_parameters))
+
     STORAGES = {
         "staticfiles": {
             "BACKEND": "django.contrib.staticfiles.storage.StaticFilesStorage"
         },
         "default": {
             "BACKEND": "storages.backends.azure_storage.AzureStorage",
-            "OPTIONS": {
-                "azure_container": cfg_azure["container_name"],
-                "connection_string": cfg_azure["connection_string"],
-            },
+            "OPTIONS": options,
         },
     }