Allow antioch to handle koszko.org email.

1 files changed, 40 insertions, 16 deletions

diff --git a/container.scm b/container.scm
index 22eada4..282ad03 100644
--- a/container.scm
+++ b/container.scm
@@ -852,29 +852,53 @@ exim_path = /run/setuid-programs/exim
     ("*.ctftilde" "" "IN" "CNAME" "ctftilde")
     ("ctftilde" "" "IN" "A" "127.0.0.1")
     ("ctftilde" "" "IN" "AAAA" "::1")
+
+    ("antioch" "" "IN" "A" "188.68.236.76")
+    ("antioch" "" "IN" "AAAA" "fe80::216:3eff:feb0:4e18")
+    ("smtp" "" "IN" "CNAME" "antioch")
+    ("imap" "" "IN" "CNAME" "antioch")
+
     ("@"    "" "IN" "A"     "93.95.227.159")
     ("@"    "" "IN" "AAAA"  "fe80::5054:5dff:fe5f:e39f")
     ("*"    "" "IN" "CNAME" "@")
     ;; mail
     ("@"      "" "IN" "MX 10" "koszko.org.")
     ;; dmarc
-    ("@"      "" "IN" "TXT"   "\"v=spf1 ip4:93.95.227.159 -all\"")
+    ("@"      "" "IN" "TXT"   "\"v=spf1 ip4:93.95.227.159 ip6:fe80::5054:5dff:fe5f:e39f ip4:188.68.236.76 ip6:fe80::216:3eff:feb0:4e18 -all\"")
     ("_dmarc" "" "IN" "TXT"   "\"v=DMARC1;p=reject;rua=mailto:dmarc@koszko.org;ruf=mailto:dmarc@koszko.org;rf=afrf;pct=100\"")
+
     ("mail._domainkey" "" "IN" "TXT" "(
- \"k=rsa;t=s;p=MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAx0kXNRIL\"
- \"VRDaU1iPdUu2FwX+pRbNS4DwojiOYznESt1npY8LzYV3MBKf2XXOSl+6Ui8Jy91V\"
- \"KzoUqwN9Rh6vdsLYPaMMtPUe/gN1AOqyF4qYqz499VZqRLmoPyq4EV5eRSqbDeDb\"
- \"eDOaoJ0+ZJHG6qg2eAz1v2U++lsSRTOkXe3xZFxrHRrvXg5JVl5DNGRKBjotwW8O\"
- \"EMhwUa2LbmJA/EbbCWhXfmaIEwqP2LRUF2HqFMSr4IHHopcTKQwpSwbsOGYG8MV1\"
- \"c5HelO+OROpuUNPE8YoKVHKwfWdwgStrrkSYK+H5JQvJgFvyfsyePfXfqszde+4B\"
- \"EC34ScPW86HKmw4JltFpBCiBThYdD0fu8g5mQzdtwNUbCcPkuUDrUTA4TE44ScHO\"
- \"VYDX0QWaUubrsf5F1+bwyTKuzbUHXnbXw7r7JLC2P4CjtsS4MLYjrfeQ3TIEdj+s\"
- \"WtWVItIVQnFRuSTFmHKqnWNDSjmTeH5m8FWPQeDjXRj2e1f5vCrfIvyXTzWvOeIw\"
- \"DU2QfyUPUKaL9hvNvX9S3G45qM/CH5UTRc2BC0dFZHBNR/uLTGMYaatfw2QAxQzs\"
- \"cmw34IgwLGswxFj3iaDwc8d3Uh+JamFBf+GUrwjRs/sVRRiXrB+qKwlxckzWHVbV\"
- \"oABCxjKDmvE86L3kCQ+MobG0BOtFBR4BqU8CAwEAAQ==\"
-)")
+     \"k=rsa;t=s;p=MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAx0kXNRIL\"
+     \"VRDaU1iPdUu2FwX+pRbNS4DwojiOYznESt1npY8LzYV3MBKf2XXOSl+6Ui8Jy91V\"
+     \"KzoUqwN9Rh6vdsLYPaMMtPUe/gN1AOqyF4qYqz499VZqRLmoPyq4EV5eRSqbDeDb\"
+     \"eDOaoJ0+ZJHG6qg2eAz1v2U++lsSRTOkXe3xZFxrHRrvXg5JVl5DNGRKBjotwW8O\"
+     \"EMhwUa2LbmJA/EbbCWhXfmaIEwqP2LRUF2HqFMSr4IHHopcTKQwpSwbsOGYG8MV1\"
+     \"c5HelO+OROpuUNPE8YoKVHKwfWdwgStrrkSYK+H5JQvJgFvyfsyePfXfqszde+4B\"
+     \"EC34ScPW86HKmw4JltFpBCiBThYdD0fu8g5mQzdtwNUbCcPkuUDrUTA4TE44ScHO\"
+     \"VYDX0QWaUubrsf5F1+bwyTKuzbUHXnbXw7r7JLC2P4CjtsS4MLYjrfeQ3TIEdj+s\"
+     \"WtWVItIVQnFRuSTFmHKqnWNDSjmTeH5m8FWPQeDjXRj2e1f5vCrfIvyXTzWvOeIw\"
+     \"DU2QfyUPUKaL9hvNvX9S3G45qM/CH5UTRc2BC0dFZHBNR/uLTGMYaatfw2QAxQzs\"
+     \"cmw34IgwLGswxFj3iaDwc8d3Uh+JamFBf+GUrwjRs/sVRRiXrB+qKwlxckzWHVbV\"
+     \"oABCxjKDmvE86L3kCQ+MobG0BOtFBR4BqU8CAwEAAQ==\"
+     )")
+
+    ("mail-antioch._domainkey" "" "IN" "TXT" "(
+     \"k=rsa;t=s;p=MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAsC9HfcId\"
+     \"QGcBzYtBzv/VF7vPrRAASwfeAJ3pr0tddpYtFMGGm8kWPAKykX2LvP4epQPdzGL9\"
+     \"W9qLJk3R+iJSlUYLgP1s4Tr5qiUm/PEHPnjzwC8kqtJ/CrQs7WLfiuE3SElWI3iQ\"
+     \"FMRCD1Kk07axSOCgLbshthEAxZQqScYiZT7Irl4SHm9SpTUJkqh5xcCTqsW1yuG/\"
+     \"YWbfERH4PFp2pA85ZZvVEHqd+e8LMLh9EKMYRbhp9AVKMaESIegkO0RZv0KGp4aU\"
+     \"vzquG1FYQ9VOJ6KiviZANuEL4cpNrqmFb4Wbuwc6w7drWaHjFT/j1mS/eB0DN3el\"
+     \"nPQnWMTJZPhqnFZKzG37P5VkIDjbcotevsBGV28gx3VJNf1ye1x/P9f4fJw2s7EY\"
+     \"izNZx9/xfmAiOpP3KhrpE+cccBWnMHYyp0X7ClgBIQTDiLOBX3KhH+GOuADMcum1\"
+     \"4y8SHw2xSYGGk46YI0fBf8kaJsAA9wBQvuBFSj1MjxjdWt0GF0OLnGB1RsPZx+nU\"
+     \"Q+EZz0PDuv16ofN7MaOfY+kD6XoBCDjj4FDqLOgBgoLS7LfLyYTElbuItj12Yqph\"
+     \"ZPY4I+Lmn9nzl3tEnUqtRNu5LPhIR9mj/4BLp2UPgkVnqTAcA+qxoJghm8hh9AS9\"
+     \"2pelav0CarwwvUo09rcvujksuwy8TulK8ckCAwEAAQ==\"
+     )")
+
     ((string-append domain "._report._dmarc") "" "IN" "TXT" "\"v=DMARC1\""))
+
   entries)
 
 (define %koszko-org-zone-configuration
@@ -885,7 +909,7 @@ exim_path = /run/setuid-programs/exim
           (entries (make-zone-entries "koszko.org"))
           (ns "vps-93-95-227-159.1984.is.")
           (mail "koszko")
-          (serial 2024041200)))
+          (serial 2024042700)))
    (acl '("allow-axfr-from-1984"))
    (semantic-checks? #t)
    (notify '("1984-axfr-remote"))))
@@ -898,7 +922,7 @@ exim_path = /run/setuid-programs/exim
           (entries (make-zone-entries "koszkonutek-tmp.pl.eu.org"))
           (ns "vps-93-95-227-159.1984.is.")
           (mail "wk")
-          (serial 2023090200)))
+          (serial 2024042700)))
    (acl '("allow-axfr-from-1984"))
    (semantic-checks? #t)
    (notify '("1984-axfr-remote"))))