diff --git a/data.nix b/data.nix index a9c4c25..4b2c4af 100644 --- a/data.nix +++ b/data.nix @@ -145,7 +145,7 @@ rec { @ SOA ns1.11sync.net. motiejus.11sync.net. (2024011500 86400 86400 86400 86400) @ NS ns1.11sync.net. @ NS ns2.11sync.net. - @ 60 A ${fra1a} + @ 60 A ${vno1} @ TXT google-site-verification=nvUYd7_ShhPKvTn_Xbw-vPFONOhPeaYQsGp34DbV-80 @ TXT "hosted-email-verify=qeuysotu" @ MX 10 aspmx1.migadu.com. @@ -153,7 +153,7 @@ rec { @ TXT "v=spf1 include:spf.migadu.com -all" ns1 A ${vno1} ns2 A ${fra1a} - www 60 A ${fra1a} + www 60 A ${vno1} admin 60 A ${hosts."fra1-a.servers.jakst".jakstIP} key1._domainkey CNAME key1.11sync.net._domainkey.migadu.com. key2._domainkey CNAME key2.11sync.net._domainkey.migadu.com. diff --git a/hosts/fra1-a/configuration.nix b/hosts/fra1-a/configuration.nix index 26f8983..0945863 100644 --- a/hosts/fra1-a/configuration.nix +++ b/hosts/fra1-a/configuration.nix @@ -1,7 +1,5 @@ { - lib, config, - pkgs, myData, modulesPath, ... @@ -119,30 +117,6 @@ }; 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 = { enable = true; interfaces = ["0.0.0.0" "::"]; diff --git a/hosts/vno1-oh2/configuration.nix b/hosts/vno1-oh2/configuration.nix index 6e4dc12..489d39a 100644 --- a/hosts/vno1-oh2/configuration.nix +++ b/hosts/vno1-oh2/configuration.nix @@ -283,6 +283,9 @@ } ''; 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 = '' @denied not remote_ip ${myData.subnets.tailscale.cidr} abort @denied