diff --git a/data.nix b/data.nix index 3c17af3..1f159ba 100644 --- a/data.nix +++ b/data.nix @@ -126,15 +126,40 @@ rec { vno3.cidr = "192.168.100.0/24"; }; + betaJakstysLTZone = '' + $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. + @ 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. + ''; + jakstysLTZone = let fra1a = hosts."fra1-a.servers.jakst".publicIP; vno1 = hosts."vno1-oh2.servers.jakst".publicIP; in '' $ORIGIN jakstys.lt. $TTL 86400 - @ SOA ns1.jakstys.lt. motiejus.jakstys.lt. (2023100800 86400 86400 86400 86400) - @ NS ns1.jakstys.lt. - @ NS ns2.jakstys.lt. + @ SOA ns1.jakstys.lt. motiejus.jakstys.lt. (2023100800 86400 86400 86400 86400) + @ NS ns1.jakstys.lt. + @ NS ns2.jakstys.lt. + beta NS ns1.jakstys.lt. + beta NS ns2.jakstys.lt. @ 600 A ${vno1} www 600 A ${vno1} ns1 A ${vno1} @@ -146,21 +171,6 @@ rec { fra1-a A ${fra1a} vno1 A ${vno1} - beta TXT hosted-email-verify=czwt2yjp - beta TXT "v=spf1 include:spf.migadu.com -all" - _dmarc.beta TXT "v=DMARC1; p=quarantine;" - beta MX 10 aspmx1.migadu.com. - beta MX 20 aspmx2.migadu.com. - *.beta MX 10 aspmx1.migadu.com. - *.beta MX 20 aspmx2.migadu.com. - key1._domainkey.beta CNAME key1.beta.jakstys.lt._domainkey.migadu.com. - key2._domainkey.beta CNAME key2.beta.jakstys.lt._domainkey.migadu.com. - key3._domainkey.beta CNAME key3.beta.jakstys.lt._domainkey.migadu.com. - autoconfig.beta CNAME autoconfig.migadu.com. - _autodiscover._tcp.beta SRV 0 1 443 autodiscover.migadu.com. - _submissions._tcp.beta SRV 0 1 465 smtp.migadu.com. - _imaps._tcp.beta SRV 0 1 993 imap.migadu.com. - _pop3s._tcp.beta SRV 0 1 995 imap.migadu.com. @ MX 10 aspmx.l.google.com. @ MX 20 alt1.aspmx.l.google.com. diff --git a/hosts/fra1-a/configuration.nix b/hosts/fra1-a/configuration.nix index 7ab6b41..3dff80e 100644 --- a/hosts/fra1-a/configuration.nix +++ b/hosts/fra1-a/configuration.nix @@ -80,6 +80,7 @@ interfaces = ["0.0.0.0" "::"]; zones = { "jakstys.lt.".data = myData.jakstysLTZone; + "beta.jakstys.lt.".data = myData.betaJakstysLTZone; }; }; diff --git a/hosts/vno1-oh2/configuration.nix b/hosts/vno1-oh2/configuration.nix index c5e681b..74956cf 100644 --- a/hosts/vno1-oh2/configuration.nix +++ b/hosts/vno1-oh2/configuration.nix @@ -488,6 +488,7 @@ interfaces = ["0.0.0.0" "::"]; zones = { "jakstys.lt.".data = myData.jakstysLTZone; + "beta.jakstys.lt.".data = myData.betaJakstysLTZone; }; }; @@ -638,7 +639,10 @@ }; }; - environment.systemPackages = with pkgs; [geoipWithDatabase]; + environment.systemPackages = with pkgs; [ + imapsync + geoipWithDatabase + ]; networking = { hostId = "f9117e1b"; diff --git a/modules/profiles/desktop/default.nix b/modules/profiles/desktop/default.nix index 43256ad..4da8b03 100644 --- a/modules/profiles/desktop/default.nix +++ b/modules/profiles/desktop/default.nix @@ -105,6 +105,7 @@ xss-lock qpwgraph # for pipewire gpicview + imapsync trayscale # TODO why doesn't 'programs.wireshark.enable = true' install the binary? wireshark