JensWH/netz39-infra-ansible
1
0
Fork 0
forked from Netz39_Admin/netz39-infra-ansible
Code Pull requests Activity

Merge pull request '🐛 Fix proxy site template' (!82) from fix-apache-template into master

Browse source 
Reviewed-on: https://gitea.n39.eu/Netz39_Admin/netz39-infra-ansible/pulls/82
Reviewed-by: dkdent <dkdent@netz39.de>
This commit is contained in:
Stefan Haun 2022-09-14 21:29:40 +00:00
commit 7b0506c235
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
roles/setup-http-site-proxy/templates/apache-docker-proxy-site.j2
View file

@ -18,9 +18,9 @@
</ifmodule> </ifmodule>
</VirtualHost> </VirtualHost>
<IfFile {{dehydrated_certs_dir}/{{ site_name }}/cert.pem> <IfFile {{dehydrated_certs_dir}}/{{ site_name }}/cert.pem>
<IfFile {{dehydrated_certs_dir}/{{ site_name }}/privkey.pem> <IfFile {{dehydrated_certs_dir}}/{{ site_name }}/privkey.pem>
<IfFile {{dehydrated_certs_dir}/{{ site_name }}/chain.pem> <IfFile {{dehydrated_certs_dir}}/{{ site_name }}/chain.pem>
{% if 'address' in ansible_default_ipv6 %} {% if 'address' in ansible_default_ipv6 %}
<VirtualHost {{ ansible_default_ipv4.address }}:443 [{{ ansible_default_ipv6.address }}]:443> <VirtualHost {{ ansible_default_ipv4.address }}:443 [{{ ansible_default_ipv6.address }}]:443>
{% else %} {% else %}
@ -35,11 +35,11 @@
SSLEngine on SSLEngine on
SetEnvIf User-Agent ".*MSIE.*" nokeepalive ssl-unclean-shutdown SetEnvIf User-Agent ".*MSIE.*" nokeepalive ssl-unclean-shutdown
SSLCertificateFile {{dehydrated_certs_dir}/{{ site_name }}/cert.pem SSLCertificateFile {{dehydrated_certs_dir}}/{{ site_name }}/cert.pem
SSLCertificateKeyFile {{dehydrated_certs_dir}/{{ site_name }}/privkey.pem SSLCertificateKeyFile {{dehydrated_certs_dir}}/{{ site_name }}/privkey.pem
SSLCertificateChainFile {{dehydrated_certs_dir}/{{ site_name }}/chain.pem SSLCertificateChainFile {{dehydrated_certs_dir}}/{{ site_name }}/chain.pem
<% if proxy_port %> {% if proxy_port %}
AllowEncodedSlashes NoDecode AllowEncodedSlashes NoDecode
ProxyPass / http://{{ backend_host | default("localhost") }}:{{proxy_port}}/ nocanon ProxyPass / http://{{ backend_host | default("localhost") }}:{{proxy_port}}/ nocanon
RequestHeader set "X-Forwarded-Proto" expr=%{REQUEST_SCHEME} RequestHeader set "X-Forwarded-Proto" expr=%{REQUEST_SCHEME}
@ -52,9 +52,9 @@
RewriteCond %{HTTP:Connection} upgrade [NC] RewriteCond %{HTTP:Connection} upgrade [NC]
RewriteRule ^/?(.*) "ws://{{ backend_host | default("localhost") }}:{{ proxy_port }}/$1" [P,L] RewriteRule ^/?(.*) "ws://{{ backend_host | default("localhost") }}:{{ proxy_port }}/$1" [P,L]
</ifmodule> </ifmodule>
<% else %> {% else %}
Redirect 404 / Redirect 404 /
< %endif %> {% endif %}
</VirtualHost> </VirtualHost>
</IfFile> </IfFile>
</IfFile> </IfFile>