From decf699b826cf6fd5a8e5ea45b9913064abeb3d1 Mon Sep 17 00:00:00 2001
From: Adrian Moennich <adrian.moennich@cern.ch>
Date: Wed, 16 Feb 2022 15:07:44 +0100
Subject: [PATCH] Storage/S3: Update nginx config

---
 storage_s3/README.md | 8 +++++++-
 storage_s3/setup.cfg | 2 +-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/storage_s3/README.md b/storage_s3/README.md
index f38f970..c885022 100644
--- a/storage_s3/README.md
+++ b/storage_s3/README.md
@@ -15,6 +15,11 @@ to local storage (but it would of course be possible to write a script for this)
 
 ## Changelog
 
+### 3.1.1
+
+- No technical changes, just adding the missing README to PyPI and updating the nginx
+  config snippet to correclty work with the changes from 3.1 (avoiding an [nginx bug][nginx-bug])
+
 ### 3.1
 
 - Fix "invalid signature" S3 error in some cases when using `proxy=nginx` for downloads
@@ -105,7 +110,7 @@ large) attachment to memory first that comes with `proxy=on`, you need to add th
 to the `server` block in your nginx config that is responsible for Indico.
 
 ```nginx
-location ~ ^/.xsf/s3/(https?)/([^/]+)/(.+)$ {
+location ~ ^/\.xsf/s3/(?<download_protocol>https?)/(?<download_host>[^/]+)/(?<download_path>.+)$ {
         internal;
         set $download_protocol $1;
         set $download_host $2;
@@ -154,3 +159,4 @@ You would need to write your own script that downloads those files from S3.
 
 [amazon-s3]: https://aws.amazon.com/s3/
 [nginx-blog]: https://www.mediasuite.co.nz/blog/proxying-s3-downloads-nginx/
+[nginx-bug]: https://trac.nginx.org/nginx/ticket/2320
diff --git a/storage_s3/setup.cfg b/storage_s3/setup.cfg
index 0fbc8e9..94012b4 100644
--- a/storage_s3/setup.cfg
+++ b/storage_s3/setup.cfg
@@ -1,6 +1,6 @@
 [metadata]
 name = indico-plugin-storage-s3
-version = 3.1
+version = 3.1.1
 description = S3 storage backend for Indico
 long_description = file: README.md
 long_description_content_type = text/markdown; charset=UTF-8; variant=GFM