From b9488e19dbe092d71cacd2df05648197232c078f Mon Sep 17 00:00:00 2001 From: Stefan Haun Date: Wed, 14 Sep 2022 23:24:55 +0200 Subject: [PATCH] :bug: Fix proxy site template These are errors from a bodged PR (my bad) that has been merged too early. --- .../templates/apache-docker-proxy-site.j2 | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/roles/setup-http-site-proxy/templates/apache-docker-proxy-site.j2 b/roles/setup-http-site-proxy/templates/apache-docker-proxy-site.j2 index 022b0e2..a57db73 100644 --- a/roles/setup-http-site-proxy/templates/apache-docker-proxy-site.j2 +++ b/roles/setup-http-site-proxy/templates/apache-docker-proxy-site.j2 @@ -18,9 +18,9 @@ - - - + + + {% if 'address' in ansible_default_ipv6 %} {% else %} @@ -35,11 +35,11 @@ SSLEngine on SetEnvIf User-Agent ".*MSIE.*" nokeepalive ssl-unclean-shutdown - SSLCertificateFile {{dehydrated_certs_dir}/{{ site_name }}/cert.pem - SSLCertificateKeyFile {{dehydrated_certs_dir}/{{ site_name }}/privkey.pem - SSLCertificateChainFile {{dehydrated_certs_dir}/{{ site_name }}/chain.pem + SSLCertificateFile {{dehydrated_certs_dir}}/{{ site_name }}/cert.pem + SSLCertificateKeyFile {{dehydrated_certs_dir}}/{{ site_name }}/privkey.pem + SSLCertificateChainFile {{dehydrated_certs_dir}}/{{ site_name }}/chain.pem -<% if proxy_port %> +{% if proxy_port %} AllowEncodedSlashes NoDecode ProxyPass / http://{{ backend_host | default("localhost") }}:{{proxy_port}}/ nocanon RequestHeader set "X-Forwarded-Proto" expr=%{REQUEST_SCHEME} @@ -52,9 +52,9 @@ RewriteCond %{HTTP:Connection} upgrade [NC] RewriteRule ^/?(.*) "ws://{{ backend_host | default("localhost") }}:{{ proxy_port }}/$1" [P,L] -<% else %> +{% else %} Redirect 404 / -< %endif %> +{% endif %}