motiejus/config
1
Fork 0
Code Packages Releases Activity

11sync: move to vno1-oh2

Browse Source
This commit is contained in:
Motiejus Jakštys 2024-07-01 01:19:10 +03:00
parent abc073993f
commit afff09ddae
3 changed files with 5 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
data.nix
View File

@ -145,7 +145,7 @@ rec {
@ SOA ns1.11sync.net. motiejus.11sync.net. (2024011500 86400 86400 86400 86400) @ SOA ns1.11sync.net. motiejus.11sync.net. (2024011500 86400 86400 86400 86400)
@ NS ns1.11sync.net. @ NS ns1.11sync.net.
@ NS ns2.11sync.net. @ NS ns2.11sync.net.
@ 60 A ${fra1a} @ 60 A ${vno1}
@ TXT google-site-verification=nvUYd7_ShhPKvTn_Xbw-vPFONOhPeaYQsGp34DbV-80 @ TXT google-site-verification=nvUYd7_ShhPKvTn_Xbw-vPFONOhPeaYQsGp34DbV-80
@ TXT "hosted-email-verify=qeuysotu" @ TXT "hosted-email-verify=qeuysotu"
@ MX 10 aspmx1.migadu.com. @ MX 10 aspmx1.migadu.com.
@ -153,7 +153,7 @@ rec {
@ TXT "v=spf1 include:spf.migadu.com -all" @ TXT "v=spf1 include:spf.migadu.com -all"
ns1 A ${vno1} ns1 A ${vno1}
ns2 A ${fra1a} ns2 A ${fra1a}
www 60 A ${fra1a} www 60 A ${vno1}
admin 60 A ${hosts."fra1-a.servers.jakst".jakstIP} admin 60 A ${hosts."fra1-a.servers.jakst".jakstIP}
key1._domainkey CNAME key1.11sync.net._domainkey.migadu.com. key1._domainkey CNAME key1.11sync.net._domainkey.migadu.com.
key2._domainkey CNAME key2.11sync.net._domainkey.migadu.com. key2._domainkey CNAME key2.11sync.net._domainkey.migadu.com.

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

@ -1,7 +1,5 @@
{ {
lib,
config, config,
pkgs,
myData, myData,
modulesPath, modulesPath,
... ...
@ -119,30 +117,6 @@
}; };
services = { services = {
caddy = {
enable = true;
email = "motiejus+acme@jakstys.lt";
globalConfig = ''
servers {
metrics
}
'';
virtualHosts = {
"www.11sync.net".extraConfig = ''
redir https://jakstys.lt/2024/11sync-shutdown/
'';
"11sync.net".extraConfig = lib.mkForce ''
redir https://jakstys.lt/2024/11sync-shutdown/
'';
"http://admin.11sync.net".extraConfig = ''
@denied not remote_ip ${myData.subnets.tailscale.cidr}
redir / /admin/
${builtins.readFile "${pkgs.e11sync-caddyfile}"}
'';
};
};
nsd = { nsd = {
enable = true; enable = true;
interfaces = ["0.0.0.0" "::"]; interfaces = ["0.0.0.0" "::"];

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

@ -283,6 +283,9 @@
} }
''; '';
virtualHosts = { virtualHosts = {
"www.11sync.net".extraConfig = "redir https://jakstys.lt/2024/11sync-shutdown/";
"11sync.net".extraConfig = "redir https://jakstys.lt/2024/11sync-shutdown/";
"hass.jakstys.lt".extraConfig = '' "hass.jakstys.lt".extraConfig = ''
@denied not remote_ip ${myData.subnets.tailscale.cidr} @denied not remote_ip ${myData.subnets.tailscale.cidr}
abort @denied abort @denied