From a4d7bc47b333568fa61e59e8701e0352697f8603 Mon Sep 17 00:00:00 2001
From: Antoine Lambert <anlambert@softwareheritage.org>
Date: Fri, 28 Oct 2022 15:57:07 +0200
Subject: [PATCH] docker/conf/nginx: Remove no longer needed proxy and fix
formatting
flower service has been removed so we can also remove its reverse proxy
configuration.
---
docker/conf/nginx.conf | 19 ++-----------------
1 file changed, 2 insertions(+), 17 deletions(-)
diff --git a/docker/conf/nginx.conf b/docker/conf/nginx.conf
index 6f3fe24..2fe1613 100644
--- a/docker/conf/nginx.conf
+++ b/docker/conf/nginx.conf
@@ -39,20 +39,6 @@ http {
# Variables need to be set as early as possible, as they're statements from
# the rewrite module and `rewrite [...] break;` will prevent these
# statements from being executed.
-
- location /flower/ {
- set $upstream "http://flower:5555";
-
- rewrite ^/flower/(.*)$ /$1 break;
- proxy_pass $upstream;
-
- proxy_set_header X-Real-IP $remote_addr;
- proxy_set_header Host $http_host;
- proxy_redirect off;
- proxy_http_version 1.1;
- proxy_set_header Upgrade $http_upgrade;
- proxy_set_header Connection "upgrade";
- }
location /rabbitmq/ {
set $upstream "http://amqp:15672";
@@ -88,8 +74,8 @@ http {
proxy_set_header Host $http_host;
proxy_set_header X-Real-IP $remote_addr;
- proxy_set_header X-Forwarded-Host $host:5080;
- proxy_set_header SCRIPT_NAME /deposit;
+ proxy_set_header X-Forwarded-Host $host:5080;
+ proxy_set_header SCRIPT_NAME /deposit;
proxy_redirect off;
}
location /objstorage {
@@ -138,7 +124,6 @@ http {
sub_filter "action=\"/" "action=\"/cmak/";
sub_filter_once off;
}
-
location /mailhog {
set $upstream "http://mailhog:8025";
proxy_pass $upstream;
--
GitLab