summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorChris Meyers <chris.meyers.fsu@gmail.com>2024-02-12 21:28:03 +0100
committerDave <dmz.oneill@gmail.com>2024-02-13 13:02:44 +0100
commitf429ef6ca70b6acb7acdf42ae41b701b8dbb0456 (patch)
treec2bf3e77fa60eb9ebca6e289062ee128b3a578cb /tools
parentgitignore pyenv python-version file (diff)
downloadawx-f429ef6ca70b6acb7acdf42ae41b701b8dbb0456.tar.xz
awx-f429ef6ca70b6acb7acdf42ae41b701b8dbb0456.zip
Allow connecting to websockets via api/websocket/
* Before, we just allowed websockets on <host>/websocket/. With this change, they can now come from <host>/api/websocket/
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 ca82f92c55..95c86cb9ee 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
@@ -10,7 +10,7 @@ location {{ (ingress_path + '/favicon.ico').replace('//', '/') }} {
alias /awx_devel/awx/public/static/favicon.ico;
}
-location {{ (ingress_path + '/websocket').replace('//', '/') }} {
+location ~ ({{ (ingress_path + '/websocket').replace('//', '/') }}|{{ (ingress_path + '/api/websocket').replace('//', '/') }}) {
# Pass request to the upstream alias
proxy_pass http://daphne;
# Require http version 1.1 to allow for upgrade requests