From 323215628e8fbc1771466d3097c4e9bf5d1d40d0 Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Mon, 10 Jan 2022 07:53:11 +0100 Subject: [PATCH] fix for deployed version --- .../nginx/sites-available/gradido.conf.ssl.template | 8 +++----- .../nginx/sites-available/gradido.conf.template | 7 +++---- nginx/gradido.conf | 10 ++++------ 3 files changed, 10 insertions(+), 15 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 cb12ae5f3..b8d127192 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,7 +66,6 @@ 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://127.0.0.1:4000; proxy_redirect off; } @@ -80,7 +79,6 @@ 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 06d7956bb..286075c89 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; } @@ -65,7 +65,6 @@ 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 cceed59d5..31f4474e0 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,7 +51,6 @@ 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,8 +63,7 @@ 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; }