From a1469f11854b882af6398619ff1e8769fdeae3f2 Mon Sep 17 00:00:00 2001
From: Jacob Lifshay <programmerjake@gmail.com>
Date: Fri, 12 Jul 2024 05:26:50 -0700
Subject: [PATCH 1/2] fix write_config to properly error for mismatched config
 files

---
 setup.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup.sh b/setup.sh
index 4bf0862..defb4df 100755
--- a/setup.sh
+++ b/setup.sh
@@ -107,7 +107,7 @@ function write_config()
     env "${new_vars[@]}" envsubst "$vars" < "$src" > "$temp" || { rm -f "$temp"; exit 1; }
     chmod "$mode" "$temp" || { rm -f "$temp"; exit 1; }
     chown "$owner" "$temp" || { rm -f "$temp"; exit 1; }
-    if mv -n -T "$temp" "$dest"; then
+    if [[ ! -f "$dest" ]] && mv -v -T "$temp" "$dest"; then
         return 0
     fi
     if diff -u --label="expanded $src" "$temp" "$dest"; then

From 88a0d19062b5d608cba9529254d2630913b28282 Mon Sep 17 00:00:00 2001
From: Jacob Lifshay <programmerjake@gmail.com>
Date: Fri, 12 Jul 2024 05:30:22 -0700
Subject: [PATCH 2/2] enable ipv6 for docker to retain proper source addresses
 for SPF

---
 nginx_templates/conf.d/default.conf.template |  1 +
 nginx_templates/ssl_listen.conf.template     |  1 +
 templates/etc/docker/daemon.json             | 42 +++++++++++++++++++-
 3 files changed, 42 insertions(+), 2 deletions(-)

diff --git a/nginx_templates/conf.d/default.conf.template b/nginx_templates/conf.d/default.conf.template
index 90f77d3..802075a 100644
--- a/nginx_templates/conf.d/default.conf.template
+++ b/nginx_templates/conf.d/default.conf.template
@@ -1,5 +1,6 @@
 server {
     listen 80;
+    listen [::]:80;
 
     return 301 https://$host$request_uri;
 }
diff --git a/nginx_templates/ssl_listen.conf.template b/nginx_templates/ssl_listen.conf.template
index 7ba9498..bd12aaf 100644
--- a/nginx_templates/ssl_listen.conf.template
+++ b/nginx_templates/ssl_listen.conf.template
@@ -1,4 +1,5 @@
 listen 443 ssl;
+listen [::]:443 ssl;
 
 http2 on;
 
diff --git a/templates/etc/docker/daemon.json b/templates/etc/docker/daemon.json
index a442642..efb9015 100644
--- a/templates/etc/docker/daemon.json
+++ b/templates/etc/docker/daemon.json
@@ -1,3 +1,41 @@
 {
-    "storage-driver": "overlay2"
-}
\ No newline at end of file
+    "storage-driver": "overlay2",
+    "ipv6": true,
+    "fixed-cidr-v6": "fd57:d7e4:f221::/64",
+    "experimental": true,
+    "ip6tables": true,
+    "default-address-pools": [
+        {
+            "base": "172.17.0.0/16",
+            "size": 16
+        },
+        {
+            "base": "172.18.0.0/16",
+            "size": 16
+        },
+        {
+            "base": "172.19.0.0/16",
+            "size": 16
+        },
+        {
+            "base": "172.20.0.0/14",
+            "size": 16
+        },
+        {
+            "base": "172.24.0.0/14",
+            "size": 16
+        },
+        {
+            "base": "172.28.0.0/14",
+            "size": 16
+        },
+        {
+            "base": "fd57:d7e4:f221:1::/64",
+            "size": 64
+        },
+        {
+            "base": "fd57:d7e4:f221:2::/64",
+            "size": 64
+        }
+    ]
+}