From 303c343c401358dbf68f4342ac9af7da988a0f67 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Motiejus=20Jak=C5=A1tys?= <motiejus@jakstys.lt>
Date: Sat, 20 Jan 2024 14:36:34 +0200
Subject: [PATCH] admin.11sync.net

---
 data.nix                       |  2 +-
 flake.lock                     | 14 +++++++-------
 hosts/fra1-a/configuration.nix |  6 ++++--
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/data.nix b/data.nix
index 2a7a0bc..ca6d9cc 100644
--- a/data.nix
+++ b/data.nix
@@ -145,7 +145,7 @@ rec {
     ns1                      A   ${vno1}
     ns2                      A   ${fra1a}
     www               600    A   ${fra1a}
-    admin             600    A   ${fra1a}
+    admin             600    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.
     key3._domainkey      CNAME   key3.11sync.net._domainkey.migadu.com.
diff --git a/flake.lock b/flake.lock
index 5e71b37..d590088 100644
--- a/flake.lock
+++ b/flake.lock
@@ -71,11 +71,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1705745512,
-        "narHash": "sha256-kcf2xuu3lQdXY+WNWjk4RiPJyhxB8Ewr7H5FQRAbL3w=",
+        "lastModified": 1705754139,
+        "narHash": "sha256-cG444HFP/t27diJsRo7clqzzXhhaN3GpGG5GuorM+jk=",
         "ref": "refs/heads/main",
-        "rev": "5c957684e4f2a3ae15e687b4a4324dfdb9ba3eaf",
-        "revCount": 131,
+        "rev": "7d6143a83230298e85c45283435f702dd359e8c7",
+        "revCount": 135,
         "type": "git",
         "url": "https://git.jakstys.lt/motiejus/e11sync"
       },
@@ -248,11 +248,11 @@
     },
     "nur": {
       "locked": {
-        "lastModified": 1705736227,
-        "narHash": "sha256-jOpNLWAB8W4B5Lii+m60KqVjKKzYvAQj2a6/Gdf/ytM=",
+        "lastModified": 1705751097,
+        "narHash": "sha256-WYDyMjCFPvY/4oAb51znGVYO87L+murinwJSKWjlXyQ=",
         "owner": "nix-community",
         "repo": "NUR",
-        "rev": "f8acdb369de0846742840c1b19026f81df6af24b",
+        "rev": "883f061dd30e40bb06f1ed490ab073cb18c41a41",
         "type": "github"
       },
       "original": {
diff --git a/hosts/fra1-a/configuration.nix b/hosts/fra1-a/configuration.nix
index 281489d..e92fbc8 100644
--- a/hosts/fra1-a/configuration.nix
+++ b/hosts/fra1-a/configuration.nix
@@ -96,9 +96,11 @@
         "www.11sync.net".extraConfig = ''
           redir https://11sync.net
         '';
-        "admin.11sync.net".extraConfig = ''
+        "http://admin.11sync.net".extraConfig = ''
           @denied not remote_ip ${myData.subnets.tailscale.cidr}
-          ${builtins.readFile "${pkgs.e11sync-frontend}"}
+
+          redir / /admin/
+          ${builtins.readFile "${pkgs.e11sync-caddyfile}"}
         '';
       };
     };