summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorElijah DeLee <kdelee@redhat.com>2024-01-29 20:52:37 +0100
committerChris Meyers <chrismeyersfsu@users.noreply.github.com>2024-01-29 21:30:16 +0100
commit9aa3d5584a97c3db63eeb9c8742dc132a403dd63 (patch)
treeca93fb261b4f707fc4b0323b6d00752061118dc9 /tools
parentAdded hop node information and beefed up exec nodes section. (#14787) (diff)
downloadawx-9aa3d5584a97c3db63eeb9c8742dc132a403dd63.tar.xz
awx-9aa3d5584a97c3db63eeb9c8742dc132a403dd63.zip
fix nginx append slash to respect proxy
This is already fixed in awx-operator. See https://github.com/ansible/awx-operator/blob/a534c856dbebc853191fb2547346007a60f137db/roles/installer/templates/configmaps/config.yaml.j2#L215 This just makes it so a development environment can also work correctly behind a proxy Fixes problem of GET to https://$PROXY/something/awx/v2/me rewritten to https://$AWX/something/awx/v2/me/ (which doesn't exist) instead path is correctly rewritten as https://$PROXY/something/awx/v2/me/
Diffstat (limited to 'tools')
-rw-r--r--tools/docker-compose/ansible/roles/sources/templates/nginx.locations.conf.j22
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/docker-compose/ansible/roles/sources/templates/nginx.locations.conf.j2 b/tools/docker-compose/ansible/roles/sources/templates/nginx.locations.conf.j2
index be8496eee2..ca82f92c55 100644
--- a/tools/docker-compose/ansible/roles/sources/templates/nginx.locations.conf.j2
+++ b/tools/docker-compose/ansible/roles/sources/templates/nginx.locations.conf.j2
@@ -34,7 +34,7 @@ location {{ (ingress_path + '/websocket').replace('//', '/') }} {
location {{ ingress_path }} {
# Add trailing / if missing
- rewrite ^(.*[^/])$ $1/ permanent;
+ rewrite ^(.*)$http_host(.*[^/])$ $1$http_host$2/ permanent;
uwsgi_read_timeout 120s;
uwsgi_pass uwsgi;
include /etc/nginx/uwsgi_params;