motiejus
/
config
1
Fork 0
Code Packages Releases Activity

move beta to it's own zone

compress-drv-tests
Motiejus Jakštys 2023-12-16 00:20:17 +02:00
parent 605142d713
commit 84be8520dd
4 changed files with 35 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
data.nix
View File

@ -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.

1
hosts/fra1-a/configuration.nix
View File

@ -80,6 +80,7 @@
interfaces = ["0.0.0.0" "::"];
zones = {
"jakstys.lt.".data = myData.jakstysLTZone;
"beta.jakstys.lt.".data = myData.betaJakstysLTZone;
};
};

6
hosts/vno1-oh2/configuration.nix
View File

@ -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";

1
modules/profiles/desktop/default.nix
View File

@ -105,6 +105,7 @@
xss-lock
qpwgraph # for pipewire
gpicview
imapsync
trayscale
# TODO why doesn't 'programs.wireshark.enable = true' install the binary?
wireshark