From c34d9cc7cfcab7a5eee46e6529f7d57f72e708ca Mon Sep 17 00:00:00 2001
From: Sebastien Bourdeauducq <sb@m-labs.hk>
Date: Wed, 13 Dec 2023 18:29:51 +0800
Subject: [PATCH] nixbld: host malloctech email

---
 nixbld-etc-nixos/configuration.nix   | 19 ++++++++++++++++++-
 nixbld-etc-nixos/named/malloctech.fr | 22 ++++++++++++++++++++++
 2 files changed, 40 insertions(+), 1 deletion(-)
 create mode 100644 nixbld-etc-nixos/named/malloctech.fr

diff --git a/nixbld-etc-nixos/configuration.nix b/nixbld-etc-nixos/configuration.nix
index 99a2b036..0a0a1804 100644
--- a/nixbld-etc-nixos/configuration.nix
+++ b/nixbld-etc-nixos/configuration.nix
@@ -316,6 +316,23 @@ in
           "216.218.133.2" "2001:470:600::2"       # slave.dns.he.net
         ];
       };
+      "malloctech.fr" = {
+        name = "malloctech.fr";
+        master = true;
+        file = "/etc/nixos/named/malloctech.fr";
+        extraConfig =
+           ''
+           dnssec-policy "default";
+           inline-signing yes;
+           notify explicit;
+           also-notify {
+             216.218.130.2;   # ns1.he.net
+           };
+           '';
+        slaves = [
+          "216.218.133.2" "2001:470:600::2"       # slave.dns.he.net
+        ];
+      };
       "200-29.98.206.103.in-addr.arpa" = {
         name = "200-29.98.206.103.in-addr.arpa";
         master = true;
@@ -1081,7 +1098,7 @@ in
     enable = true;
     localDnsResolver = false;  # conflicts with dnsmasq
     fqdn = "mail.m-labs.hk";
-    domains = [ "m-labs.hk" "m-labs.ph" "193thz.com" ];
+    domains = [ "m-labs.hk" "m-labs.ph" "193thz.com" "malloctech.fr" ];
     enablePop3 = true;
     enablePop3Ssl = true;
     certificateScheme = "acme-nginx";
diff --git a/nixbld-etc-nixos/named/malloctech.fr b/nixbld-etc-nixos/named/malloctech.fr
new file mode 100644
index 00000000..c9100927
--- /dev/null
+++ b/nixbld-etc-nixos/named/malloctech.fr
@@ -0,0 +1,22 @@
+$TTL 7200
+
+@						SOA	ns.malloctech.fr. sb.m-labs.hk. (
+							2023121302
+							7200
+							3600
+							86400
+							600)
+
+
+						NS		ns.malloctech.fr.
+						NS		ns1.he.net.
+
+						MX		10 mail.m-labs.hk.
+						TXT		"v=spf1 mx a:router.alt.m-labs.hk -all"
+						TXT		"google-site-verification=LALF-fafTnmkL-18m3CzwFjSwEV1C7NeKexiNfMYsOw"
+
+ns						A		94.190.212.123
+ns						AAAA	2001:470:18:390::2
+
+mail._domainkey			TXT	"v=DKIM1; k=rsa; p=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC+Op2B9cdVxwyweChOBJtk4LGkLUfxunI3a7sSL0aVnntfPWkKgY7zTL8iOJaqdt/DkkvOz++HEsn3AzleXsdibaTC9x6kgrMVgkrsYOKA4bWDLJiUfgq7vvRMdkw6rOqlJp9+faXKIKwtMG9Ckd1+rHBsaFwe7EE0coLbhGZaQQIDAQAB"
+_dmarc					TXT	"v=DMARC1; p=none"