From e4ffdf6a2d4d5fc180e795830e1a2cee69633000 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Motiejus=20Jak=C5=A1tys?= Date: Sat, 20 Jan 2024 12:13:58 +0200 Subject: [PATCH] admin.e11sync.net --- data.nix | 1 + flake.lock | 8 ++++---- flake.nix | 1 + hosts/fra1-a/configuration.nix | 13 ++++++++++--- 4 files changed, 16 insertions(+), 7 deletions(-) diff --git a/data.nix b/data.nix index 767b694..2a7a0bc 100644 --- a/data.nix +++ b/data.nix @@ -145,6 +145,7 @@ rec { ns1 A ${vno1} ns2 A ${fra1a} www 600 A ${fra1a} + admin 600 A ${fra1a} key1._domainkey CNAME key1.11sync.net._domainkey.migadu.com. key2._domainkey CNAME key2.11sync.net._domainkey.migadu.com. key3._domainkey CNAME key3.11sync.net._domainkey.migadu.com. diff --git a/flake.lock b/flake.lock index c0fe187..5e71b37 100644 --- a/flake.lock +++ b/flake.lock @@ -71,11 +71,11 @@ ] }, "locked": { - "lastModified": 1705742771, - "narHash": "sha256-N4DskS7Td5DeM70ZAs9A644XUMkNHoly96QfZ336cAc=", + "lastModified": 1705745512, + "narHash": "sha256-kcf2xuu3lQdXY+WNWjk4RiPJyhxB8Ewr7H5FQRAbL3w=", "ref": "refs/heads/main", - "rev": "97eb1f0fed235d7337b81ccc6e5380a94766c629", - "revCount": 128, + "rev": "5c957684e4f2a3ae15e687b4a4324dfdb9ba3eaf", + "revCount": 131, "type": "git", "url": "https://git.jakstys.lt/motiejus/e11sync" }, diff --git a/flake.nix b/flake.nix index 2db727f..9b576de 100644 --- a/flake.nix +++ b/flake.nix @@ -108,6 +108,7 @@ # nixpkgs-unstable. See git log around the switch from 23.05 to 23.11. mkOverlays = _: [ nur.overlay + e11sync.overlays.default ]; in { diff --git a/hosts/fra1-a/configuration.nix b/hosts/fra1-a/configuration.nix index 9c854b5..281489d 100644 --- a/hosts/fra1-a/configuration.nix +++ b/hosts/fra1-a/configuration.nix @@ -1,5 +1,6 @@ { config, + pkgs, myData, modulesPath, ... @@ -91,9 +92,15 @@ metrics } ''; - virtualHosts."www.11sync.net".extraConfig = '' - redir https://11sync.net - ''; + virtualHosts = { + "www.11sync.net".extraConfig = '' + redir https://11sync.net + ''; + "admin.11sync.net".extraConfig = '' + @denied not remote_ip ${myData.subnets.tailscale.cidr} + ${builtins.readFile "${pkgs.e11sync-frontend}"} + ''; + }; }; nsd = {