From 584e50d117a0075ebabf46e6915a13dc9fbcdccd Mon Sep 17 00:00:00 2001 From: Luis Date: Fri, 4 Mar 2022 14:40:05 -0300 Subject: [PATCH 1/2] fix hookshot provisioning url in nginx Hello, this PR should fix Hookshot container not receiving API calls with the right path because nginx proxy was stripping the /v1 from it. --- roles/matrix-bridge-hookshot/tasks/init.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/roles/matrix-bridge-hookshot/tasks/init.yml b/roles/matrix-bridge-hookshot/tasks/init.yml index 041bb764..8bd2d5a0 100644 --- a/roles/matrix-bridge-hookshot/tasks/init.yml +++ b/roles/matrix-bridge-hookshot/tasks/init.yml @@ -55,10 +55,10 @@ {# Use the embedded DNS resolver in Docker containers to discover the service #} resolver 127.0.0.11 valid=5s; set $backend "{{ matrix_hookshot_container_url }}:{{ matrix_hookshot_provisioning_port }}"; - proxy_pass http://$backend/$1; + proxy_pass http://$backend/v1/$1; {% else %} {# Generic configuration for use outside of our container setup #} - proxy_pass http://127.0.0.1:{{ matrix_hookshot_provisioning_port }}/$1; + proxy_pass http://127.0.0.1:{{ matrix_hookshot_provisioning_port }}/v1/$1; {% endif %} proxy_set_header Host $host; } From 833ac506fe904f21e2350c72560220a3fea19e26 Mon Sep 17 00:00:00 2001 From: Luis Date: Fri, 4 Mar 2022 15:08:16 -0300 Subject: [PATCH 2/2] pass GET parameters too This fixes parameters not being passed to the provisioning api --- roles/matrix-bridge-hookshot/tasks/init.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/roles/matrix-bridge-hookshot/tasks/init.yml b/roles/matrix-bridge-hookshot/tasks/init.yml index 8bd2d5a0..25204f04 100644 --- a/roles/matrix-bridge-hookshot/tasks/init.yml +++ b/roles/matrix-bridge-hookshot/tasks/init.yml @@ -55,10 +55,10 @@ {# Use the embedded DNS resolver in Docker containers to discover the service #} resolver 127.0.0.11 valid=5s; set $backend "{{ matrix_hookshot_container_url }}:{{ matrix_hookshot_provisioning_port }}"; - proxy_pass http://$backend/v1/$1; + proxy_pass http://$backend/v1/$1$is_args$args; {% else %} {# Generic configuration for use outside of our container setup #} - proxy_pass http://127.0.0.1:{{ matrix_hookshot_provisioning_port }}/v1/$1; + proxy_pass http://127.0.0.1:{{ matrix_hookshot_provisioning_port }}/v1/$1$is_args$args; {% endif %} proxy_set_header Host $host; }