From 031987aaab7dd0f9c68e72140f863ca02d56eb48 Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Mon, 10 Jan 2022 07:41:07 +0100 Subject: [PATCH] corrected some minor routings in nginx --- .../nginx/sites-available/gradido.conf.ssl.template | 8 +++++--- .../nginx/sites-available/gradido.conf.template | 8 +++++--- nginx/gradido.conf | 10 ++++++---- 3 files changed, 16 insertions(+), 10 deletions(-) diff --git a/deployment/bare_metal/nginx/sites-available/gradido.conf.ssl.template b/deployment/bare_metal/nginx/sites-available/gradido.conf.ssl.template index 435949d7e..7325127e6 100644 --- a/deployment/bare_metal/nginx/sites-available/gradido.conf.ssl.template +++ b/deployment/bare_metal/nginx/sites-available/gradido.conf.ssl.template @@ -40,12 +40,12 @@ server { proxy_set_header X-Real-IP $remote_addr; proxy_set_header Host $host; - proxy_pass http://127.0.0.1:3000; + proxy_pass http://127.0.0.1:3000/; proxy_redirect off; } # Backend - location /graphql { + location /graphql/ { proxy_http_version 1.1; proxy_set_header Upgrade $http_upgrade; proxy_set_header Connection 'upgrade'; @@ -53,7 +53,7 @@ server { proxy_set_header X-Real-IP $remote_addr; proxy_set_header Host $host; - proxy_pass http://127.0.0.1:4000; + proxy_pass http://127.0.0.1:4000/; proxy_redirect off; } @@ -66,6 +66,7 @@ server { proxy_set_header X-Real-IP $remote_addr; proxy_set_header Host $host; + # no trailing slash to keep the hook/ prefix proxy_pass http://backend:4000; proxy_redirect off; } @@ -79,6 +80,7 @@ server { proxy_set_header X-Real-IP $remote_addr; proxy_set_header Host $host; + # no trailing slash to keep the admin/ prefix proxy_pass http://127.0.0.1:8080; proxy_redirect off; } diff --git a/deployment/bare_metal/nginx/sites-available/gradido.conf.template b/deployment/bare_metal/nginx/sites-available/gradido.conf.template index 0ebdc36d7..c820033f3 100644 --- a/deployment/bare_metal/nginx/sites-available/gradido.conf.template +++ b/deployment/bare_metal/nginx/sites-available/gradido.conf.template @@ -25,12 +25,12 @@ server { proxy_set_header X-Real-IP $remote_addr; proxy_set_header Host $host; - proxy_pass http://127.0.0.1:3000; + proxy_pass http://127.0.0.1:3000/; proxy_redirect off; } # Backend - location /graphql { + location /graphql/ { proxy_http_version 1.1; proxy_set_header Upgrade $http_upgrade; proxy_set_header Connection 'upgrade'; @@ -38,7 +38,7 @@ server { proxy_set_header X-Real-IP $remote_addr; proxy_set_header Host $host; - proxy_pass http://127.0.0.1:4000; + proxy_pass http://127.0.0.1:4000/; proxy_redirect off; } @@ -51,6 +51,7 @@ server { proxy_set_header X-Real-IP $remote_addr; proxy_set_header Host $host; + # no trailing slash to keep the hook/ prefix proxy_pass http://backend:4000; proxy_redirect off; } @@ -64,6 +65,7 @@ server { proxy_set_header X-Real-IP $remote_addr; proxy_set_header Host $host; + # no trailing slash to keep the admin/ prefix proxy_pass http://127.0.0.1:8080; proxy_redirect off; } diff --git a/nginx/gradido.conf b/nginx/gradido.conf index 820e4a705..cceed59d5 100644 --- a/nginx/gradido.conf +++ b/nginx/gradido.conf @@ -25,12 +25,12 @@ server { proxy_set_header X-Real-IP $remote_addr; proxy_set_header Host $host; - proxy_pass http://frontend:3000; + proxy_pass http://frontend:3000/; proxy_redirect off; } # Backend - location /graphql { + location /graphql/ { proxy_http_version 1.1; proxy_set_header Upgrade $http_upgrade; proxy_set_header Connection 'upgrade'; @@ -38,7 +38,7 @@ server { proxy_set_header X-Real-IP $remote_addr; proxy_set_header Host $host; - proxy_pass http://backend:4000; + proxy_pass http://backend:4000/; proxy_redirect off; } @@ -51,6 +51,7 @@ server { proxy_set_header X-Real-IP $remote_addr; proxy_set_header Host $host; + # no trailing slash to keep the hook/ prefix proxy_pass http://backend:4000; proxy_redirect off; } @@ -63,7 +64,8 @@ server { proxy_set_header X-Forwarded-For $remote_addr; proxy_set_header X-Real-IP $remote_addr; proxy_set_header Host $host; - + + # no trailing slash to keep the admin/ prefix proxy_pass http://admin:8080; proxy_redirect off; }