From 8ec12905bb57975117aaf2ef0f20502e7800119c Mon Sep 17 00:00:00 2001 From: pulmonarycosignerkindness <70479260+pulmonarycosignerkindness@users.noreply.github.com> Date: Thu, 18 Feb 2021 17:08:01 +0000 Subject: [PATCH] Make the proxy_pass address use a variable Adjust the proxy_pass port/IP so that it follows the matrix_grafana_container_http_host_bind_port variable when using an external webserver. The code checks how long the variable is (if the user has set just a port, , or the full address, :), and sets the proxy_pass value accordingly. --- .../templates/nginx/conf.d/matrix-grafana.conf.j2 | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/roles/matrix-nginx-proxy/templates/nginx/conf.d/matrix-grafana.conf.j2 b/roles/matrix-nginx-proxy/templates/nginx/conf.d/matrix-grafana.conf.j2 index 0e1f1c2d7..3cf2e6e78 100644 --- a/roles/matrix-nginx-proxy/templates/nginx/conf.d/matrix-grafana.conf.j2 +++ b/roles/matrix-nginx-proxy/templates/nginx/conf.d/matrix-grafana.conf.j2 @@ -18,7 +18,11 @@ proxy_pass http://$backend; {% else %} {# Generic configuration for use outside of our container setup #} - proxy_pass http://127.0.0.1:3000; + {% if matrix_grafana_container_http_host_bind_port|length > 5 %} + proxy_pass http://{{matrix_grafana_container_http_host_bind_port}}; + {% else %} + proxy_pass http://127.0.0.1:{{matrix_grafana_container_http_host_bind_port}}; + {% endif %} {% endif %} proxy_set_header Host $host;