From 31fc12dfb200558dcc85fc252afc6adfe7040a07 Mon Sep 17 00:00:00 2001
From: Stefan Haun <tux@netz39.de>
Date: Thu, 4 Aug 2022 17:32:06 +0200
Subject: [PATCH 1/2] :bug: Fix template for missing IPv6 on
apache-docker-forward
---
.../templates/apache-docker-forward-site.j2 | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/roles/setup-http-site-forward/templates/apache-docker-forward-site.j2 b/roles/setup-http-site-forward/templates/apache-docker-forward-site.j2
index 1fc1fc3..686c2ba 100644
--- a/roles/setup-http-site-forward/templates/apache-docker-forward-site.j2
+++ b/roles/setup-http-site-forward/templates/apache-docker-forward-site.j2
@@ -1,4 +1,8 @@
+{% if 'address' in ansible_default_ipv6 %}
<VirtualHost {{ ansible_default_ipv4.address }}:80 [{{ ansible_default_ipv6.address }}]:80>
+{% else %}
+<VirtualHost {{ ansible_default_ipv4.address }}:80>
+{% endif %}
ServerAdmin {{ server_admin }}
ServerName {{ site_name }}
ServerAlias {{ site_name }}
@@ -15,7 +19,11 @@
</VirtualHost>
<IfFile /usr/local/etc/dehydrated/certs/{{ site_name }}>
+{% if 'address' in ansible_default_ipv6 %}
<VirtualHost {{ ansible_default_ipv4.address }}:443 [{{ ansible_default_ipv6.address }}]:443>
+{% else %}
+<VirtualHost {{ ansible_default_ipv4.address }}:443>
+{% endif %}
ServerAdmin {{ server_admin }}
ServerName {{ site_name }}
ServerAlias {{ site_name }}
From a410ce5b8f2a65fec3e0f8dfd43470bc73219459 Mon Sep 17 00:00:00 2001
From: Stefan Haun <tux@netz39.de>
Date: Thu, 4 Aug 2022 17:32:23 +0200
Subject: [PATCH 2/2] :bug: Fix template for missing IPv6 on
apache-docker-proxy
---
.../templates/apache-docker-proxy-site.j2 | 8 ++++++++
1 file changed, 8 insertions(+)
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 d64dc95..b6a81c3 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
@@ -1,4 +1,8 @@
+{% if 'address' in ansible_default_ipv6 %}
<VirtualHost {{ ansible_default_ipv4.address }}:80 [{{ ansible_default_ipv6.address }}]:80>
+{% else %}
+<VirtualHost {{ ansible_default_ipv4.address }}:80>
+{% endif %}
ServerAdmin {{ server_admin }}
ServerName {{ site_name }}
ServerAlias {{ site_name }}
@@ -17,7 +21,11 @@
<IfFile /usr/local/etc/dehydrated/certs/{{ site_name }}/cert.pem>
<IfFile /usr/local/etc/dehydrated/certs/{{ site_name }}/privkey.pem>
<IfFile /usr/local/etc/dehydrated/certs/{{ site_name }}/chain.pem>
+{% if 'address' in ansible_default_ipv6 %}
<VirtualHost {{ ansible_default_ipv4.address }}:443 [{{ ansible_default_ipv6.address }}]:443>
+{% else %}
+<VirtualHost {{ ansible_default_ipv4.address }}:443>
+{% endif %}
ServerAdmin {{ server_admin }}
ServerName {{ site_name }}
ServerAlias {{ site_name }}