commit afff09ddae0d3d11fb2de1924a8edd32ec17f381 (tree)
parent abc073993f55739c10244eb04efb329211414ef6
Author: Motiejus Jakštys <motiejus@jakstys.lt>
Date: Mon, 1 Jul 2024 01:19:10 +0300
11sync: move to vno1-oh2
Diffstat:
3 files changed, 5 insertions(+), 28 deletions(-)
diff --git 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
@@ -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
@@ -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
