From ee75b9c82eef6f5f8ceb11e0669eae50905452b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Motiejus=20Jak=C5=A1tys?= Date: Mon, 15 Jan 2024 15:08:04 +0200 Subject: [PATCH] wip 11sync --- data.nix | 79 ++++++++++++++++---------------- hosts/fra1-a/configuration.nix | 2 +- hosts/vno1-oh2/configuration.nix | 2 +- 3 files changed, 42 insertions(+), 41 deletions(-) diff --git a/data.nix b/data.nix index 0f01701..a2abcb4 100644 --- a/data.nix +++ b/data.nix @@ -128,30 +128,31 @@ rec { vno3.cidr = "192.168.100.0/24"; }; - betaJakstysLTZone = let + e11syncZone = let vno1 = hosts."vno1-oh2.servers.jakst".publicIP; + fra1a = hosts."fra1-a.servers.jakst".publicIP; in '' - $ORIGIN beta.jakstys.lt. - $TTL 86400 - @ SOA ns1.jakstys.lt. motiejus.jakstys.lt. (2023121600 86400 86400 86400 86400) - @ NS ns1.jakstys.lt. - @ NS ns2.jakstys.lt. - @ A ${vno1} - @ TXT hosted-email-verify=czwt2yjp - @ TXT "v=spf1 include:spf.migadu.com -all" - _dmarc TXT "v=DMARC1; p=quarantine;" - @ MX 10 aspmx1.migadu.com. - @ MX 20 aspmx2.migadu.com. - * MX 10 aspmx1.migadu.com. - * MX 20 aspmx2.migadu.com. - key1._domainkey CNAME key1.beta.jakstys.lt._domainkey.migadu.com. - key2._domainkey CNAME key2.beta.jakstys.lt._domainkey.migadu.com. - key3._domainkey CNAME key3.beta.jakstys.lt._domainkey.migadu.com. - autoconfig CNAME autoconfig.migadu.com. - _autodiscover._tcp SRV 0 1 443 autodiscover.migadu.com. - _submissions._tcp SRV 0 1 465 smtp.migadu.com. - _imaps._tcp SRV 0 1 993 imap.migadu.com. - _pop3s._tcp SRV 0 1 995 imap.migadu.com. + $ORIGIN 11sync.net. + $TTL 3600 + @ SOA ns1.11sync.net. motiejus.11sync.net. (2024011500 86400 86400 86400 86400) + @ NS ns1.11sync.net + @ NS ns2.11sync.net + @ A ${fra1a} + @ TXT "hosted-email-verify=qeuysotu" + @ MX 10 aspmx1.migadu.com. + @ MX 20 aspmx2.migadu.com. + @ TXT "v=spf1 include:spf.migadu.com -all" + ns1 A ${vno1} + ns2 A ${fra1a} + key1._domainkey CNAME key1.11sync.net._domainkey.migadu.com. + key2._domainkey CNAME key2.11sync.net._domainkey.migadu.com. + key3._domainkey CNAME key3.11sync.net._domainkey.migadu.com. + _dmarc TXT "v=DMARC1; p=quarantine;" + autoconfig CNAME autoconfig.migadu.com. + _autodiscover._tcp SRV 0 1 443 autodiscover.migadu.com. + _submissions._tcp SRV 0 1 465 smtp.migadu.com. + _imaps._tcp SRV 0 1 993 imap.migadu.com. + _pop3s._tcp SRV 0 1 995 pop.migadu.com. ''; jakstysLTZone = let @@ -176,23 +177,23 @@ rec { fra1-a A ${fra1a} vno1 A ${vno1} - @ 600 TXT hosted-email-verify=rvyd6h64 - @ 600 MX 10 aspmx1.migadu.com. - @ 600 MX 20 aspmx2.migadu.com. - * 600 MX 10 aspmx1.migadu.com. - * 600 MX 20 aspmx2.migadu.com. - key1._domainkey 600 CNAME key1.jakstys.lt._domainkey.migadu.com. - key2._domainkey 600 CNAME key2.jakstys.lt._domainkey.migadu.com. - key3._domainkey 600 CNAME key3.jakstys.lt._domainkey.migadu.com. - @ 600 TXT "v=spf1 include:spf.migadu.com -all" - _dmarc 600 TXT "v=DMARC1; p=quarantine;" - * 600 MX 10 aspmx1.migadu.com. - * 600 MX 20 aspmx2.migadu.com. - autoconfig 600 CNAME autoconfig.migadu.com. - _autodiscover._tcp 600 SRV 0 1 443 autodiscover.migadu.com. - _submissions._tcp 600 SRV 0 1 465 smtp.migadu.com. - _imaps._tcp 600 SRV 0 1 993 imap.migadu.com. - _pop3s._tcp 600 SRV 0 1 995 imap.migadu.com. + @ 3600 TXT hosted-email-verify=rvyd6h64 + @ 3600 MX 10 aspmx1.migadu.com. + @ 3600 MX 20 aspmx2.migadu.com. + * 3600 MX 10 aspmx1.migadu.com. + * 3600 MX 20 aspmx2.migadu.com. + key1._domainkey 3600 CNAME key1.jakstys.lt._domainkey.migadu.com. + key2._domainkey 3600 CNAME key2.jakstys.lt._domainkey.migadu.com. + key3._domainkey 3600 CNAME key3.jakstys.lt._domainkey.migadu.com. + @ 3600 TXT "v=spf1 include:spf.migadu.com -all" + _dmarc 3600 TXT "v=DMARC1; p=quarantine;" + * 3600 MX 10 aspmx1.migadu.com. + * 3600 MX 20 aspmx2.migadu.com. + autoconfig 3600 CNAME autoconfig.migadu.com. + _autodiscover._tcp 3600 SRV 0 1 443 autodiscover.migadu.com. + _submissions._tcp 3600 SRV 0 1 465 smtp.migadu.com. + _imaps._tcp 3600 SRV 0 1 993 imap.migadu.com. + _pop3s._tcp 3600 SRV 0 1 995 imap.migadu.com. grafana A ${hosts."vno1-oh2.servers.jakst".jakstIP} _acme-challenge.grafana CNAME _acme-endpoint.grafana diff --git a/hosts/fra1-a/configuration.nix b/hosts/fra1-a/configuration.nix index 3dff80e..4732c6b 100644 --- a/hosts/fra1-a/configuration.nix +++ b/hosts/fra1-a/configuration.nix @@ -80,7 +80,7 @@ interfaces = ["0.0.0.0" "::"]; zones = { "jakstys.lt.".data = myData.jakstysLTZone; - "beta.jakstys.lt.".data = myData.betaJakstysLTZone; + "11sync.net.".data = myData.e11syncZone; }; }; diff --git a/hosts/vno1-oh2/configuration.nix b/hosts/vno1-oh2/configuration.nix index d85ca2e..3efb0ec 100644 --- a/hosts/vno1-oh2/configuration.nix +++ b/hosts/vno1-oh2/configuration.nix @@ -513,7 +513,7 @@ interfaces = ["0.0.0.0" "::"]; zones = { "jakstys.lt.".data = myData.jakstysLTZone; - "beta.jakstys.lt.".data = myData.betaJakstysLTZone; + "11sync.net.".data = myData.e11syncZone; }; };