diff --git a/roles/nginx/site/templates/site.conf.j2 b/roles/nginx/site/templates/site.conf.j2 index 7d83b0a..d8f06e6 100644 --- a/roles/nginx/site/templates/site.conf.j2 +++ b/roles/nginx/site/templates/site.conf.j2 @@ -1,6 +1,7 @@ {% if proxy is defined and proxy is not string %} upstream upstream_{{ site }} { {% for item in proxy %} +{% set item = item | regex_replace("^(https://)?([^/]*).*$", "\\2") %} {% if item | regex_search(".*:[0-9]+$") %} server {{ item }}; {% else %} @@ -35,9 +36,10 @@ server { {% elif proxy is defined %} location / { {% if proxy is not string %} +{% set path = proxy[0] | regex_replace("^(https://)?([^/]*)(.*)$", "\\3") %} # https://trac.nginx.org/nginx/ticket/1307 proxy_ssl_verify off; - proxy_pass https://upstream_{{ site }}; + proxy_pass https://upstream_{{ site }}{{ path }}; {% else %} proxy_pass {{ proxy }}; {% endif %}