From 2261f58fe432a683dafe812ebb19fca302e881e4 Mon Sep 17 00:00:00 2001 From: Henrik Steen Date: Thu, 27 Jun 2024 00:49:15 +0200 Subject: [PATCH] Move users-api proxy to nginx --- .../service-nginx-front-1/files/foreningenbs.conf | 15 +++++++++++++++ .../service-web-1/templates/foreningenbs.conf.j2 | 3 --- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/ansible/roles/service-nginx-front-1/files/foreningenbs.conf b/ansible/roles/service-nginx-front-1/files/foreningenbs.conf index 47415fd3..ac8171b5 100644 --- a/ansible/roles/service-nginx-front-1/files/foreningenbs.conf +++ b/ansible/roles/service-nginx-front-1/files/foreningenbs.conf @@ -170,6 +170,21 @@ server { proxy_pass $upstream; } + location ~ ^/users-api/ { + proxy_set_header Host $http_host; + proxy_set_header X-Forwarded-Host $host; + proxy_set_header X-Forwarded-Server $host; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-Proto $scheme; + + proxy_redirect off; + + # Setting a variable to defer resolving. + set $upstream http://users-api.zt.foreningenbs.no:8000; + proxy_pass $upstream; + } + location / { proxy_set_header Host $http_host; proxy_set_header X-Forwarded-Host $host; diff --git a/ansible/roles/service-web-1/templates/foreningenbs.conf.j2 b/ansible/roles/service-web-1/templates/foreningenbs.conf.j2 index 956fc597..1737208b 100644 --- a/ansible/roles/service-web-1/templates/foreningenbs.conf.j2 +++ b/ansible/roles/service-web-1/templates/foreningenbs.conf.j2 @@ -45,9 +45,6 @@ Alias /smaabruket /var/www/aliases/smaabruket/public RewriteRule /smaabruket-test /confluence/pages/viewpage.action?pageId=2031684 [PT,L] - # Brukersystemet. - ProxyPass /users-api http://users-api.zt.foreningenbs.no:8000 - # Statutter. Alias /statutter/arkiv /var/www/statutter-arkiv/arkiv RewriteRule ^/statutter/?$ https://foreningenbs.no/confluence/display/statutter [R,L]