From a57838eced5040ed7cc337d41dd571b69db94d8b Mon Sep 17 00:00:00 2001 From: Ismail Demirbilek Date: Fri, 29 Dec 2023 13:51:53 +0300 Subject: [PATCH 1/4] fix custom minio usage --- nginx/nginx.conf.template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nginx/nginx.conf.template b/nginx/nginx.conf.template index 4775dcbfad4..e929bb7740f 100644 --- a/nginx/nginx.conf.template +++ b/nginx/nginx.conf.template @@ -29,8 +29,8 @@ http { proxy_pass http://space:3000/spaces/; } - location /${BUCKET_NAME}/ { - proxy_pass http://plane-minio:9000/uploads/; + location /uploads/ { + proxy_pass ${AWS_S3_ENDPOINT_URL}/${AWS_S3_BUCKET_NAME}; } } } From 78e8c412a860770ee45c84f02455cc5f5441b104 Mon Sep 17 00:00:00 2001 From: Ismail Demirbilek Date: Fri, 29 Dec 2023 13:54:10 +0300 Subject: [PATCH 2/4] revert custom path --- nginx/nginx.conf.template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nginx/nginx.conf.template b/nginx/nginx.conf.template index e929bb7740f..35cef7273fc 100644 --- a/nginx/nginx.conf.template +++ b/nginx/nginx.conf.template @@ -29,7 +29,7 @@ http { proxy_pass http://space:3000/spaces/; } - location /uploads/ { + location /${BUCKET_NAME}/ { proxy_pass ${AWS_S3_ENDPOINT_URL}/${AWS_S3_BUCKET_NAME}; } } From ae5c6378cfedae07fe4ca9c46cb65dfa3c1149e4 Mon Sep 17 00:00:00 2001 From: Ismail Demirbilek Date: Fri, 29 Dec 2023 17:33:38 +0300 Subject: [PATCH 3/4] fix trailing slash --- nginx/nginx.conf.template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nginx/nginx.conf.template b/nginx/nginx.conf.template index 35cef7273fc..e18af26cd0f 100644 --- a/nginx/nginx.conf.template +++ b/nginx/nginx.conf.template @@ -30,7 +30,7 @@ http { } location /${BUCKET_NAME}/ { - proxy_pass ${AWS_S3_ENDPOINT_URL}/${AWS_S3_BUCKET_NAME}; + proxy_pass ${AWS_S3_ENDPOINT_URL}/${AWS_S3_BUCKET_NAME}/; } } } From 47db7376fe7d824d09d58ad1068a23f590d3ec9d Mon Sep 17 00:00:00 2001 From: Ismail Demirbilek Date: Fri, 7 Jun 2024 19:27:26 +0300 Subject: [PATCH 4/4] Update nginx.conf.template --- nginx/nginx.conf.template | 4 ---- 1 file changed, 4 deletions(-) diff --git a/nginx/nginx.conf.template b/nginx/nginx.conf.template index bc9a8c6b800..d38c4c9468b 100644 --- a/nginx/nginx.conf.template +++ b/nginx/nginx.conf.template @@ -61,10 +61,6 @@ http { } location /${BUCKET_NAME}/ { - proxy_http_version 1.1; - proxy_set_header Upgrade ${dollar}http_upgrade; - proxy_set_header Connection "upgrade"; - proxy_set_header Host ${dollar}http_host; proxy_pass ${AWS_S3_ENDPOINT_URL}/${AWS_S3_BUCKET_NAME}/; } }