From dc065d3e744ec2be9a857de03b54bba93a2ad056 Mon Sep 17 00:00:00 2001 From: magnusanatolius Date: Thu, 27 Feb 2020 18:58:14 +0100 Subject: [PATCH] general bug fixing* --- docker-compose.yml | 1 + portal/nginx/nginx.conf | 19 ++++++++++++++++++- 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 8e6c301..9c7316d 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -36,6 +36,7 @@ services: - postgres networks: - app-network + restart: on-failure pgadmin: image: dpage/pgadmin4 diff --git a/portal/nginx/nginx.conf b/portal/nginx/nginx.conf index 2102866..d1399c7 100644 --- a/portal/nginx/nginx.conf +++ b/portal/nginx/nginx.conf @@ -1,5 +1,9 @@ -resolver 127.0.0.1 [::]; +worker_processes 1; + +events { + worker_connections 1024; +} upstream backend_gatekeeper { server gatekeeper:4000; @@ -17,6 +21,7 @@ server { include /etc/nginx/mime.types; listen 3000; listen [::]:3000; + listen [::]:7000; server_name _; access_log /var/log/nginx/host.access.log; @@ -46,6 +51,18 @@ server { proxy_set_header X-Forwarded-Proto $scheme; } + location /keycloak/auth/ { + proxy_pass http://backend_keycloak/keycloak/auth/; + proxy_set_header Host $host; + + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header X-Forwarded-Host $host; + proxy_set_header X-Forwarded-Server $host; + proxy_set_header X-Forwarded-Port $server_port; + proxy_set_header X-Forwarded-Proto $scheme; + } + location /source-manager/ { proxy_pass http://backend_source_manager/;