From 6d31b77f0e5c5e3d0e98709d2c9cb3321c03f600 Mon Sep 17 00:00:00 2001
From: Sebastien Bourdeauducq <sb@m-labs.hk>
Date: Thu, 23 Mar 2023 15:22:16 +0800
Subject: [PATCH] add .ph site

---
 nixbld-etc-nixos/configuration.nix | 21 ++++++++++++++++++---
 nixbld-etc-nixos/named/m-labs.ph   | 26 ++++++++++++++++++++++++++
 2 files changed, 44 insertions(+), 3 deletions(-)
 create mode 100644 nixbld-etc-nixos/named/m-labs.ph

diff --git a/nixbld-etc-nixos/configuration.nix b/nixbld-etc-nixos/configuration.nix
index 0e3dab87..87ef10af 100644
--- a/nixbld-etc-nixos/configuration.nix
+++ b/nixbld-etc-nixos/configuration.nix
@@ -195,6 +195,21 @@ in
           "216.218.133.2" "2001:470:600::2"       # slave.dns.he.net
         ];
       };
+      "m-labs.ph" = {
+        name = "m-labs.ph";
+        master = true;
+        file = "/etc/nixos/named/m-labs.ph";
+        extraConfig =
+           ''
+           notify explicit;
+           also-notify {
+             216.218.130.2;   # ns1.he.net
+           };
+           '';
+        slaves = [
+          "216.218.133.2" "2001:470:600::2"       # slave.dns.he.net
+        ];
+      };
     };
     extraConfig = ''
       zone "mil." IN {
@@ -687,8 +702,8 @@ in
     in {
       "m-labs.hk" = mainWebsite;
       "www.m-labs.hk" = mainWebsite;
-      "m-labs.science" = mainWebsite;
-      "www.m-labs.science" = mainWebsite;
+      "m-labs.ph" = mainWebsite;
+      "www.m-labs.ph" = mainWebsite;
       "lab.m-labs.hk" = {
         forceSSL = true;
         enableACME = true;
@@ -897,7 +912,7 @@ in
     enable = true;
     localDnsResolver = false;  # conflicts with dnsmasq
     fqdn = "mail.m-labs.hk";
-    domains = [ "m-labs.hk" ];
+    domains = [ "m-labs.hk" "m-labs.ph" ];
     enablePop3 = true;
     enablePop3Ssl = true;
     certificateScheme = 3;
diff --git a/nixbld-etc-nixos/named/m-labs.ph b/nixbld-etc-nixos/named/m-labs.ph
new file mode 100644
index 00000000..0ac77029
--- /dev/null
+++ b/nixbld-etc-nixos/named/m-labs.ph
@@ -0,0 +1,26 @@
+$TTL 7200
+
+@						SOA	ns1.m-labs.ph. sb.m-labs.hk. (
+							2023032305
+							7200
+							3600
+							86400
+							600)
+
+
+						NS		ns1.m-labs.ph.
+						NS		ns1.he.net.
+
+						A		94.190.212.123
+						AAAA	2001:470:18:390::2
+						MX		10 mail.m-labs.hk.
+						TXT		"v=spf1 mx -all"
+						TXT		"google-site-verification=g2k8M1fhbYOPs4C37SeGCfNlD6paWcexamji1DXrp0o"
+
+ns1						A		94.190.212.123
+ns1						AAAA	2001:470:18:390::2
+
+mail._domainkey			TXT		"v=DKIM1; k=rsa; p=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDPUlkoA4Gucsin6P5LSohSOpPbpOELkbKDz9MmB4Zzj4QdcQNtMzU3Uis8WZwVXknQ/6URoDdTa4aR8+PwMi5fjKpLM8ZAnnHJHYebZPDRq6lQo3VGdaCu9NhdjYwFhvK9VRyhwI9i7DUptdLsu/OzbgTlCdWQTOr+MFEkYwmxLQIDAQAB"
+_dmarc					TXT		"v=DMARC1; p=none"
+
+www						CNAME	@