Various updates

2025-03-16 17:54:42 +01:00 · 2025-03-16 17:54:42 +01:00 · 375a85e0e7
commit 375a85e0e7
parent 26165af972
25 changed files with 291 additions and 167 deletions
--- a/hosts/arr/default.nix
+++ b/hosts/arr/default.nix
@ -4,13 +4,39 @@
  lib,
  ...
 }:
+let
+  tailscaleMagicDNS = "neon-dory.ts.net";
+in
 {
+
+  age.secrets = {
+    tailscale-authKey.file = ../../secrets/tailscale-authKey.age;
+  };
+
  my = {
    utils = {
      commons.enable = true;
      lxc-standard.enable = true;
    };

+    networking = {
+      nas-samba-share = {
+        enable = true;
+        allowUsers = with config.services; [
+          sonarr.user
+          radarr.user
+          lidarr.user
+          readarr.user
+          bazarr.user
+        ];
+      };
+      tailscale = {
+        enable = true;
+        magicDNSDomain = tailscaleMagicDNS;
+        authKeyFile = config.age.secrets.tailscale-authKey.path;
+      };
+    };
+
    services.media-mgr = {
      programs.enable = true;
    };
--- a/hosts/authentik/default.nix
+++ b/hosts/authentik/default.nix
@ -6,11 +6,15 @@
  ...
 }:
 let
+  tailscaleMagicDNS = "neon-dory.ts.net";
  p = import ../parameters.nix;
 in
 {

-  age.secrets.authentik-env.file = ../../secrets/authentik-env.age;
+  age.secrets = {
+    authentik-env.file = ../../secrets/authentik-env.age;
+    tailscale-authKey.file = ../../secrets/tailscale-authKey.age;
+  };

  my = {
    utils = {
@ -18,6 +22,14 @@ in
      lxc-standard.enable = true;
    };

+    networking = {
+      tailscale = {
+        enable = true;
+        magicDNSDomain = tailscaleMagicDNS;
+        authKeyFile = config.age.secrets.tailscale-authKey.path;
+      };
+    };
+
    services.authentik = {
      enable = true;
      envFile = config.age.secrets.authentik-env.path;
--- a/hosts/caddy/dashy-settings.nix
+++ b/hosts/caddy/dashy-settings.nix
@ -37,51 +37,36 @@ in

  sections = [
    {
+      name = "Widget";
      displayData = {
-        collapsed = true;
-        cols = 2;
-        customStyles = "border: 2px dashed red;";
-        itemSize = "large";
+        cols = 3;
+        collapsed = false;
      };
-      items = [
+      widgets = [
        {
-          backgroundColor = "#0079ff";
-          color = "#00ffc9";
-          description = "Source code and documentation on GitHub";
-          icon = "fab fa-github";
-          target = "sametab";
-          title = "Source";
-          url = "https://github.com/Lissy93/dashy";
+          type = "clock";
+          options = {
+            timeZone = "Europe/Rome";
+            hideSeconds = true;
+            customCityName = "Borgo Valsugana";
+          };
        }
+        { type = "public-ip"; }
+        # {
+        #   type = "HealthChecks";
+        #   apiKey = "";
+        # }
+        # { type = "system-info"; }
        {
-          description = "View currently open issues, or raise a new one";
-          icon = "fas fa-bug";
-          title = "Issues";
-          url = "https://github.com/Lissy93/dashy/issues";
-        }
-        {
-          description = "Live Demo #1";
-          icon = "fas fa-rocket";
-          target = "iframe";
-          title = "Demo 1";
-          url = "https://dashy-demo-1.as93.net";
-        }
-        {
-          description = "Live Demo #2";
-          icon = "favicon";
-          target = "newtab";
-          title = "Demo 2";
-          url = "https://dashy-demo-2.as93.net";
-        }
-        {
-          description = "Proxmox";
-          icon = "fab fa-linux";
-          target = "newtab";
-          title = "Proxmox";
-          url = "https://192.168.1.177:8006";
+          type = "proxmox-lists";
+          options = {
+            cluster_url = "https://bacco.${p.domains.public}";
+            user_name = "root@pam";
+            token_name = "dashy2";
+            token_uuid = "2e63b0df-6be7-46b4-be13-6558ad0be647";
+          };
        }
      ];
-      name = "Getting Started";
    }
    {
      name = "Public Services";
@ -90,6 +75,11 @@ in
        collapsed = false;
      };
      items = [
+        {
+          title = "Authentik";
+          url = "https://auth.${p.domains.public}";
+          icon = "hl-authentik";
+        }
        {
          title = "Nextcloud";
          url = "https://cloud.${p.domains.public}";
@ -114,6 +104,30 @@ in
          url = "https://search.${p.domains.ts}";
          icon = "hl-searxng";
        }
+        {
+          title = "Portainer";
+          url = "https://portainer.${p.domains.public}";
+          icon = "hl-portainer";
+        }
+      ];
+    }
+    {
+      name = "Network Services";
+      displayData = {
+        cols = 1;
+        collapsed = false;
+      };
+      items = [
+        {
+          title = "Primary DNS";
+          url = "https://${p.hosts.dns01}";
+          icon = "hl-technitium";
+        }
+        {
+          title = "Seconday DNS";
+          url = "https://${p.hosts.dns02}";
+          icon = "hl-technitium";
+        }
      ];
    }
    {
@ -135,6 +149,24 @@ in
        }
      ];
    }
-
+    {
+      name = "Devices";
+      displayData = {
+        cols = 1;
+        collapsed = false;
+      };
+      items = [
+        {
+          title = "Bacco";
+          url = "https://bacco.internal:8006";
+          icon = "hl-proxmox";
+        }
+        {
+          title = "Node";
+          url = "https://node.internal:8006";
+          icon = "hl-proxmox";
+        }
+      ];
+    }
  ];
 }
--- a/hosts/caddy/default.nix
+++ b/hosts/caddy/default.nix
@ -146,6 +146,11 @@ in
            host = "http://${p.hosts.homeassistant}:8123";
            domain = p.domains.public;
          }
+          {
+            subdomain = "torrent";
+            host = "http://qbittorrent.${p.domains.tsDns}:8080";
+            domain = p.domains.ts;
+          }
        ];

      };
--- a/hosts/dns/dns-02.nix
+++ b/hosts/dns/dns-02.nix
@ -15,7 +15,7 @@

    networking.technitium-dns-server = {
      enable = true;
-      dnsOverHttps = false;
+      dnsOverHttps = true;
      adminPasswordFile = config.age.secrets.dns02-admin-password.path;
    };

--- a/hosts/parameters.nix
+++ b/hosts/parameters.nix
@ -10,6 +10,8 @@
    plex = "plex.internal";
    portainer = "portainer.internal";
    colmena = "colmena.internal";
+    pve01 = "bacco.internal";
+    pve02 = "node.internal";
    dns01 = "192.168.1.2";
    dns02 = "192.168.1.3";
    shadowshocks = "shadowshocks.internal";
@ -17,5 +19,7 @@
  domains = {
    public = "pasetto.me";
    ts = "tegola.pro";
+    tsDns = "bison-altair.ts.net";
+    internal = "internal";
  };
 }
--- a/hosts/shadowshocks/default.nix
+++ b/hosts/shadowshocks/default.nix
@ -4,12 +4,27 @@
  lib,
  ...
 }:
+let
+  shadowshocks-port = 8388;
+  p = import ../parameters.nix;
+in
 {

-  age.secrets.shadowshocks-password.file = ../../secrets/shadowshocks-password.age;
+  age.secrets = {
+    shadowshocks-password.file = ../../secrets/shadowshocks-password.age;
+    tailscale-authKey.file = ../../secrets/tailscale-authKey.age;
+  };

  my = {

+    networking = {
+      tailscale = {
+        enable = true;
+        magicDNSDomain = p.domains.tsDns;
+        authKeyFile = config.age.secrets.tailscale-authKey.path;
+      };
+    };
+
    utils = {
      commons.enable = true;
      commons.gc.enable = true;
@ -22,8 +37,11 @@
  services.shadowsocks = {
    enable = true;
    passwordFile = config.age.secrets.shadowshocks-password.path;
-    port = 8388;
+    port = shadowshocks-port;
  };

+  # open shadownsocks port
+  networking.firewall.allowedTCPPorts = [ shadowshocks-port ];
+
  system.stateVersion = "24.11";
 }
--- a/modules/networking/caddy.nix
+++ b/modules/networking/caddy.nix
@ -144,7 +144,8 @@ in
          '') cfg.dynamicdnsDomains
        );

-      extraConfig = lib.concatStringsSep "\n" (
+      extraConfig =
+        lib.concatStringsSep "\n" (
          map (
            domainConfig:
            let
@ -158,7 +159,33 @@ in
              }
            ''
          ) cfg.domainsList
-      );
+        )
+        + "\n"
+        + ''
+          (cors) {
+            @cors_preflight{args[0]} method OPTIONS
+            @cors{args[0]} header Origin {args[0]}
+
+            handle @cors_preflight{args[0]} {
+              header {
+                Access-Control-Allow-Origin "{args[0]}"
+                Access-Control-Allow-Methods "GET, POST, PUT, PATCH, DELETE, OPTIONS"
+                Access-Control-Allow-Headers *
+                Access-Control-Max-Age "3600"
+                defer
+              }
+              respond "" 204
+            }
+
+            handle @cors{args[0]} {
+              header {
+                Access-Control-Allow-Origin "{args[0]}"
+                Access-Control-Expose-Headers *
+                defer
+              }
+            }
+          }
+        '';

      virtualHosts = lib.foldl' (
        acc: extraVirtualHost:
@ -167,6 +194,7 @@ in
          "${extraVirtualHost.subdomain}.${extraVirtualHost.domain}".extraConfig = ''
            reverse_proxy ${extraVirtualHost.host}
            import cloudflare_${extraVirtualHost.domain}
+            import cors https://home.pasetto.me
          '';
        }
      ) { } cfg.extraVirtualHosts;
--- a/secrets/authentik-env.age
+++ b/secrets/authentik-env.age
@ -1,14 +1,13 @@
 age-encryption.org/v1
-> ssh-ed25519 l7h2MQ X+9Exzg1MBqWGoxWOoE7Chlht9VC3+tmi04AfP9FiWE
-fgnUuzDaMiHDrqfTSVwGTHZbHbCspzgFP4bk4U2fZmA
-> ssh-ed25519 Si3UKw O1Q/BmFqn8l6PTKJv7ZXFyYx1NAmy6A60DV1l/NKins
-/mgD5JAVUagtWIVsaEGpFOWJYNXVYnMduGffLMbf+Yk
-> ssh-ed25519 3UG3uw s2Zk2OS9qucu8eNMxpLOmRQHSNxfXWuaj1zg4lZ34xI
-Q/KU1YDikdA9QKCW6z7+mE4K9jLDmlI4jM2yOrJfNIU
-> ssh-ed25519 JEhtoQ gyMgaDl4IQ/DnTXaTq/jFiTijiinBIfcqW8f7ThZuhg
-RABtE9ahX4owCm0fci6Tx4diZb53sOjp0cbR5Pr3XAY
-> ssh-ed25519 uqg2jw 5dwaltYPBGFia1ox8jdQK8ndi/BZhXT2LtoZTJjDExM
-xBQEqW6Gtn2QjNshnKKD2mAuydb/o1ah7QIzLyuvS9w
--- ECR8Vxb7HjBihIWig/o2Tm1V8tnSt13MAQ+NBn/YZoc
-•É>’ˆmñ}ú‘<C2AD>>S%Ú <20>Ø¬q¥bÅ
÷—{âO²\KI¢†é¬Pi?ýÝ
-¼Ý8#ÍÊ+}¨ÁÝ‹†£"‡‘UÊq9(”Ëå¯#H÷3?Ò'WoÅ²8Bë÷ºä÷÷×¹6£µ[qþÒ<C3BE>µÍ»?C+à£`ü”%ƒyëfÅ‚ §2#><3E>Þ‚³>÷ŸýºÆ!ëûS›âé<>æÉFÉÇy®lÑ\Wš>oY|t\të<74>Ô0½§v–¿5äˆöqI<71>õ
+-> ssh-ed25519 l7h2MQ iF9I6qdHJnC4o4LrB6j3L53i5wlQGh9ee0j0eIhTX1A
+HEha6KexIUXtHXIuZScyiEuVsYO3m0HDF1XnP86R1qY
+-> ssh-ed25519 Si3UKw H6FShRJ6B/FkeOpLnK2QQURoNYr83W4F+9vZELiaCWE
+I4ZKXlCALGkQpIVU2dMdwrjhTkeN6bpjPQBDt67Lfzg
+-> ssh-ed25519 3UG3uw N2s3xye+Rp5FW2jSU4Cvajw2AQo+HZtuuBX9GtnwXyk
+brSudCxPLLlG6htwfpR014tpMEOcnNoCC3N8WVmEE0w
+-> ssh-ed25519 JEhtoQ tR/OPXWQm6vYw3pQLk3gjXZfQgKumqET7eTbVlgWNUk
+a2RlOtVDskdUXLxvU7dXmvPzDJ91ja8L6cchlX+Bvtk
+-> ssh-ed25519 uqg2jw p6ZyV56qNraT2vehQzKBV0QiITQJJr4LB4optOqyok0
+cPgXVfgukAGKgHDgaxnkhi6IukGrROnETrb+gS3NXSY
+--- 4/RMC+vcak6JuT1APGkyMlnYevSiQIa5wgcIK+DGB9U
+ßZR…®ßa® kìøBì=¿ (áŸVƒI0f'ê.Œ0b¨Éa°uz0q®&6lmºbhÔSŠ †)Æ|a 47¾,{ß ˆµ²ØpBØ"u|Ìô´ªÛÉK‰¼ Qå¾ðªZe„Ù”ÄmHbud|Áj G1Àhfì/±ÊÇ™ñÚ;Š·¶ÿY~„Öàëïš2Ìëƒ¬îWÃiÓZª?¬#4Žú>Ö¦„ n@<40>X‡ŠnÊ›A,ò?Á:yœXmÎnÒÓlÂ
--- a/secrets/bazarr-apiKey.age
+++ b/secrets/bazarr-apiKey.age
--- a/secrets/cloudflare-pasetto-apiKey.age
+++ b/secrets/cloudflare-pasetto-apiKey.age
@ -1,13 +1,13 @@
 age-encryption.org/v1
-> ssh-ed25519 BFt3Fg sT11aJ+LgQkfPTMUA7Ryfb2nn8JSvik9ONHbPrmpcjU
-EHC2iDKZXwCjcdL/a9V1BlBcTmFc1mQ+/XgBT76NEzY
-> ssh-ed25519 Si3UKw 1+bphVYp4UKz7saq4ehFBT9u4Kg75l0O6QT5CWVcc3U
-+0xipJ5QnJcTkyk1jPwJamiwheqkLvXKJQoRqUj6aSc
-> ssh-ed25519 3UG3uw n/IVp8jscJ41dmADJPg/93GsthdazPecXT/NEhRFuQg
-ku2no68hEBr5fsKVZQV8lse5y2BWNKYKR3gunYJhFEA
-> ssh-ed25519 JEhtoQ 2B6Am++Sm4lU8JC17l26J4Dy7EbDZEvYGPurw3V2uXU
-Nw65ljTQ10PhFRdCrHmZDatFj79ExiMMlCTWDL9nVLY
-> ssh-ed25519 uqg2jw 1cpbOTsLqpBZYhb8kXTul3Cgm+Ll13ijahBTTBIxzzQ
-e2xFH5hvZrqscXKO4Eh7ukuH31jRBwxSALPHsXzt/4o
--- w9R2MkfytUtf8ibHq6hbzhibDKCBsMqJhxE6vVccvGY
-Fnöóěh™đGS:fC¸Č>dŹnú»Ë®î°Üą‚çu,ŔAÚ¬—„‡ ľôľáÎę|¶kĄQČ3‹˙ÔŤj‰ÜČ“öÄÍGŘ…ëôl¸Ă¨I:ćáz
+-> ssh-ed25519 BFt3Fg 8//bFUZP6UOvIhKFtMpHNgDUNRZomQK8axcMAjILqhQ
+8FsFBoHT1/usFws9RyiSTwJHOFmDvVRKcYk1DLtKq3o
+-> ssh-ed25519 Si3UKw t3h0HWa4gFFrE0p17V5bwyFYWF4Jl1o6OV4dLMkiWAU
+jj4afqDp+vqUx712heKIjN9tg3gMdL0s3wVzNHRkm24
+-> ssh-ed25519 3UG3uw bcoHQfthBn8ThU5roDoOd5P8hPXjYmIziNw4G7kUIUY
+WLY5DZy3XWkyWTa/KtGFB0unvf4W1JAv5580AxFg0nA
+-> ssh-ed25519 JEhtoQ ujKVr8hsfoygrurWLnGqv6lzQTGoL03XeU4Ty0yI0SY
+FnqfJwHZ/4bDKX8fzgqWLz+4v+kvs2A2x7SHbMyVjg4
+-> ssh-ed25519 uqg2jw 4RFv2xnqRkoA/tOPqJQLbdopT/EUDvZ0PzbGB0DcrG8
+SIc5u6HyOsy8uAHdY7G3J4NLf3Q04gyQxplGVJp1WUI
+--- gWDG3+F5qxnuwvnso96r2KaeuT861jyfsvd62PxOi2Q
+úV~£j¥µ(?ãnb@Ä<>a9ô¯uB”Ðê„9%v½¿.Ž)ia†ÊIµ˜´ŠÜµÒ\<5C>²wû±áK<C3A1>7äÉX1Sb`Eá¾¿Ô^£Srû"uûœëiÛˆâÈa›+˜e
--- a/secrets/cloudflare-tegola-apiKey.age
+++ b/secrets/cloudflare-tegola-apiKey.age
--- a/secrets/ddclient.age
+++ b/secrets/ddclient.age
--- a/secrets/dns01-admin-password.age
+++ b/secrets/dns01-admin-password.age
@ -1,14 +1,13 @@
 age-encryption.org/v1
-> ssh-ed25519 qaHa5g 1jjvfErOKF2PjuggGYfLRjHuvifeqxpAxDkxWbElNzQ
-L/Lgrm+vV4R19PtVkpMKEd5UVtw83/dpM3VMBv/nQeA
-> ssh-ed25519 Si3UKw 8nySaBjGPK7DrUE/IXtl6WSPq34wk5pmKyQhXroeCjI
-Ft0mi+e+jWcQhvwUXCACpf5JQZJOdAGeS8+6+H2Tbjc
-> ssh-ed25519 3UG3uw GNNCIu5ME+mI+IFUWBRFLGMnG6ubK2U5KnVlcoAxPQI
-3RDrtgax5LZnD/rLAikK7glRDMgYUzqPoQP3HLoka+c
-> ssh-ed25519 JEhtoQ O/AEb7djUkoco+9D47siiWpkMxqIhdsHFa4NY5Po9zw
-5OmCcOpgRd44FXXoWfW8aHQW+CQIutGDd+Ci8CD/7mE
-> ssh-ed25519 uqg2jw xTjnqHO6O+sPYf1MckOEP5fQpJyrB+EzIju6oalTCGc
-Z8z4sfrtbc/BJKIz4lUl0PcVgdXGCARc8GfMprciaQo
--- xyGp5MNdmEgi5qClx73FAGePhN/egCcE5ub79+4grt8
-¥tý¡y¿€?;bù
-®ÆSÒ°cS€ê¥ÃßH4:ª;j«ö£ª+x Q¦™
+-> ssh-ed25519 qaHa5g 2zhXC9UzK0i3UFtHNYL6F6qnkgN5MCdrAPGtzbkWWRQ
+uCK1Kj5F9gibqY72J1ena+h02pbyvMrSgCPNOJfH/t4
+-> ssh-ed25519 Si3UKw GMBTrVtAv3KM2foQ6aI/d8MW4FYm0anIIGs2RYPsYjw
+0n1tK6msTUJJ3+2aSIpmcZ3HBFoMGaSDb3YXfWlLUwg
+-> ssh-ed25519 3UG3uw kTKqDBeUdJohl/LM117hY2lNxPTbOOMyWo06FR/w4xQ
+lpidNg9P8n4Y7FLCriVC+r1ocyBEQ1ymZukO1c4f2jU
+-> ssh-ed25519 JEhtoQ X5vRJUfSjubbzqJQkHW4ciOHaJwMGrJqjUFXiT4JJRo
+JSe/2WBaooTJJSDWTVCDFCkhk34lPqpG+zcg13QNrDM
+-> ssh-ed25519 uqg2jw 6M6eETGqVa6jBaAoVBnYbNZFXH2PPgF/GDDlNQZFXXs
+P5l7HJS/V0B3ItWduCnZbDPuOE2UWrnpYFFQaSwCRRY
+--- Xlh+ISigahQ5OtQEUvjKjo2IN8dLRVW1+L2KrRYTgA4
+l§e‹¯Ñ4)ÆvÊ+;@iŒ+Qv@,Æ'|ó<>ÓÅt¸;Ë%»ªœ]kW<6B>¸<EFBFBD>
--- a/secrets/dns02-admin-password.age
+++ b/secrets/dns02-admin-password.age
@ -1,13 +1,13 @@
 age-encryption.org/v1
-> ssh-ed25519 FG6Lew Tn8LMojCuw86EWEwJC9sbWcijLTzcFMYyuT+R5UEd2I
-r1ksIE6O6ZUiy8hyx8k+EMZF+3aw2t59emuKzz5xM6g
-> ssh-ed25519 Si3UKw MKh0kwggd4BLUqHypG2psgL898pGLXxjVdQSdHhBb3Y
-QSyGWmlwGfs2JNPG9g3CqAzwBirccJFT41Fkusk/frI
-> ssh-ed25519 3UG3uw BcnNnU3apTLgJVUXbpS4zdJvUClPWzCWWmPkEQbkYBs
-1tIuV2siiXELhl714gGTRESNuc/BhWhO5C4nVaCzIpA
-> ssh-ed25519 JEhtoQ 5t9d9F0lV3Shs7xwpz1MVHnZpuKsluEgco8JQRRR1h0
-LfucV6aMY3vTM8V/38MPkD1QhEuBtKbPF6JDjPFEm0M
-> ssh-ed25519 uqg2jw 4Oh+REb86EnXyZkgBXStrN+BpAML5F/hA2jaHnEqHlw
-1jCJ0IoXgtr8DJjXnsAfYICUKkFj3g6cJ5zzN3P7Y98
--- WSRkKnNvsK4QmthuHP4yRPESZbc9n+YNhzjeGCx7nT0
-²ÔšÇª÷¥ñ=[¯Q¬1}Â5·<35>{Ù×·ç€¾ƒ\‘æÀèÌá`/‘ ë<C2A0>µÚ
+-> ssh-ed25519 FG6Lew p43Mfn0tI1Q3G0USkwZ5EYdIqUoNBc31qysF8OlHYXU
+jTOiJKqTDA1eYdPtn85r/putthjItNx8YbAF4YkHE64
+-> ssh-ed25519 Si3UKw fZQXVoYxaWN3wBj68vQQDcNRZ519EwLHdu6QLYLZFHs
+WRbMAljC6FJub9xCIItsQNZ0yWb6IFERZTHg4g9DB0w
+-> ssh-ed25519 3UG3uw CtY/xU9cyft2+Gco1YYd3L4yJEyUOTaDf0O+12zwmwc
+yK1tNdbi+M5uRVhsMznEWLtFo5KeP2udOZgHW//uce0
+-> ssh-ed25519 JEhtoQ Ng8gHYdyMs82HaYCmHQggpF1rqdsJr2oe2HxktdW9mI
+LtuKqUSNpUzT8d/4eihGHznRl2gbMzr1VZ8xlO5U9Ic
+-> ssh-ed25519 uqg2jw wkr4LEB62gODRn5uZo8QCVwgBuN6r+/aiqt3/MOfKxE
+RQOOd6+JUZ1DauTl1m6rW7g95njvJYGAj/pShgyJ2u8
+--- QcI0CVgcaEjRcRlpRpjDwmOzyeWs4eLLS76qyYa/P5c
+Á>+Ùü¢Û¯ï¶e*dÏôÚU+è‡d4òÉ¶Þÿf£:ñvÞ®„ðgRÑk
--- a/secrets/dns02-dhcp-failover.age
+++ b/secrets/dns02-dhcp-failover.age
@ -1,13 +1,14 @@
 age-encryption.org/v1
-> ssh-ed25519 FG6Lew xQP+esRZhn0Nj6F+/fD0jHZALFpYfpGPmvJiE+qHQGs
-4yBaYZPUkDtFED2pfb3tiocq0mYdQIytStTa/L4OAJg
-> ssh-ed25519 Si3UKw Aiyy7RIfIZEAP1jkoUQH7X4eds23JtH94BZVgZzYayo
-pVlFcZkwWHT8DQzGL/+hsfxWyeaZXm8gGwvgGAIkV4U
-> ssh-ed25519 3UG3uw avM+0lYvMLYkVVfe1+QkSODIOk4+PP1UeiW/5v/Rv1c
-gs78WQ+w9bLKlaquMs01tayqZIvui2DFqsS+cmExykM
-> ssh-ed25519 JEhtoQ /5+X0aOGOKLVEx+aB7c6sRRhhcinw8UVBOGyR7g9Cl0
-MAQ2C/YhV8+J47F1zLudTNhdWkJD9IzkHqYEB3Gv1FU
-> ssh-ed25519 uqg2jw fAspGSdFWGDGTPVEe0IM5cDXSlZgIcRYvqv1/BzuwWc
-gEwX1X7cAXumDH+ST7t50Qjk1XLIdpqHcrhddww2q0Y
--- xYzIiveUwVpmYIqNZQvsj0fSRql3q3Cv4v89oS6JH7M
-‘6D-rè±oy-%èfÚ‘ðUÇ¸ì?±çWR8@2éÍqUÉIJæ
+-> ssh-ed25519 FG6Lew WVk3brMnsAehXLgkXsSSAY1qxW/U2COwCHk3s8lnfyE
+HVBT1Jvqj5JtwpLeE0CNsj7YuU/u8/+7D3MFYGfwwwQ
+-> ssh-ed25519 Si3UKw R0qNWPWGPzeZjd6KNQ5h0NejhZ/QtCpux4stcrvla0M
+Pm1VZrko5MvD/oq5+VrQWrltpRyTpDBqeJHL0C9RZX0
+-> ssh-ed25519 3UG3uw urMsgoJAZhU23ZHdTBKz1NbWjmS+UEAQPlRViI/1Hl0
+JxPLq0H5Jm37J3figkaK2necJpVHR4Suj3I5ih/aGjQ
+-> ssh-ed25519 JEhtoQ PCKOyr+ZgTcNhnrWaV/TVafcV421e8EMZW0Rb5KELVI
+FGgE3RWrxlrnYdH1bAnq2+Mm+vkpHefAsy3EVllwuB4
+-> ssh-ed25519 uqg2jw eNgfPkb8pOpTxq6u2p345BYglnDkizqdZfcALJBKWAU
+WCxi4nQwuHaRH8hsog2UvZsALvJGxcws9Bt45uKRdgM
+--- oEGWFXo8E27YJq7y1sZHwdvpUNPaaNqX22bjxnYtUDM
+ô¬X¼Ã¤Û¶É˜í;L<>šç¡±IžVYÉîÜËð
+ÅÃ¬Ù†hÝŽGv
--- a/secrets/grafana-admin-pwd.age
+++ b/secrets/grafana-admin-pwd.age
@ -1,13 +1,13 @@
 age-encryption.org/v1
-> ssh-ed25519 xSWWeQ FTAZGuDuIVGU19IlM4+2V07xZshkGFHZeT07mWaFe0g
-mMV8rb+tqz/cXJYhjAsMPMv+YlQ3Im9YZ4CgD8AgiBc
-> ssh-ed25519 Si3UKw ecyD/9pEfAgR2OLE79Zz7vsscK09xNOhrPmQXg0zb3c
-V9CFdzMqZMoe9GCLCHe6k3oBeihxHQnrPhSLNZt8h/Q
-> ssh-ed25519 3UG3uw 8wxJGlH0/4YS1bCUa4JC1s1LpOFkutK9Kra766sJ9nk
-vWmvPvoYNDDSPKDspi4ycd0FFDJcbJuP+hRZMXMVjfM
-> ssh-ed25519 JEhtoQ MbF0zX+WHdi2YrCMstLakuzsx09flkxMqVnsTVYoeHM
-BKCJAuH/5czX1EdQk6qSg+vmn25dp+C2BXYMRC8T6xg
-> ssh-ed25519 uqg2jw p+UXsD4OkrKeUnlwq6nhAIe+OtuX5eYhXEswX+0f8RQ
-CZndgPY4kBmbVAjPxPRrszN5fqWrVKOiP23hhAS96SM
--- yhWiq0eMftKTQCyI7WxzPepeHHWyV4ab0pHGdIZN4yY
-<EFBFBD>V²Ö’3B<33>€6NºöIs€Íj„fœk7•†Þyìï’Çj—´<E28094><C2B4>è
+-> ssh-ed25519 xSWWeQ oCWIffjuGzInMGcLV5/BLYMrBofvGPh0xOkw24v09A0
+FbtodInhsgI0dlW9GpzdlzuwlZqxBaS/IVoPO1ywqNw
+-> ssh-ed25519 Si3UKw D45uueniVnl9NT177cIQ+DTeJ9C4Au9nrvpE0BSptQY
+H07+Js2ooN1E5qVdC7X9EJ2gOLsZm2TvLPOVd8lqWz8
+-> ssh-ed25519 3UG3uw AOfPVajJOEwnWL0cSjZ1QhtubVByzKOBTw3hefYv3Q0
+DbQjnT4AZYrZjdL5c+tgcfqgWgU7GD5XOgYKJsTYJzg
+-> ssh-ed25519 JEhtoQ v/X3Jw0wd6wAjcEtoPiGqsFxerdz3YbWUlX1NzlMDGk
+KiGmEKeOZY0Tll+LgylYo33ZbzMPYtVbGE0TC3nvbE4
+-> ssh-ed25519 uqg2jw PrLBZuDeIA+UCX4w/+FeEt4enJ8blXR7vfphiq0dDyY
+WubywriCxb5eHlLDDIvG3Uvz57h+oRgOd42gRceUYW8
+--- geaqacA56wYwwIbaaPTNRp1Nu72+UjGsZkONKAvvAYU
+†.¾L¹ÆŸDmþóHT¢ÁûªB}ËYœÓÁ8óØ7{µ¦ø&0qÀxR<>?Ž
--- a/secrets/grafana-secret-auth.age
+++ b/secrets/grafana-secret-auth.age
@ -1,13 +1,14 @@
 age-encryption.org/v1
-> ssh-ed25519 xSWWeQ 3RydPkTkO9NTllaQb+xvdPpTsaXMr6fidoX13VeA5x4
-W5Rf3d4is83s/O+Nl4OmE++DYtADpEgIyF68tQNWV1w
-> ssh-ed25519 Si3UKw qrSZigqJ2F4WQ6XhkkKPpMmE6oMcufAimG41o9f8R1A
-hjvYWlr+c0fvthvISuzLnyjv8dgHXRlhRAdHpdPs2mM
-> ssh-ed25519 3UG3uw aVg/3FG1u3SMmvcPSiYO5ReLaPTIgiz9SiMvdGUX0S8
-yklad0QzVvAwqAIK2c1C+GeTHoA80+EMhCYegRKsUlc
-> ssh-ed25519 JEhtoQ Im/DJgmOOGszRsq6OSQrD7iyx+kZErsyJ7v1YabriHY
-QuXZqRG9bxu5kSv4cFK3lv0KuW+2cS2nU0Y08xiiayQ
-> ssh-ed25519 uqg2jw W/IlZce1ooumCsYEe+t9PIOXumfqyIxJLfZImSNqiwE
-5JJdCjjWnF/QHQx1t/RhUeIrQQmZzNt2OUKTiHgHqtM
--- vRR7EhWNygDhJOSf+uQnomdLdpudq5FZ9zVTtm4foBQ
-"ILýÕ±Ê0Ð¬B‚×¾mLÔW/†Áñ¨ý[ôÄÃí<C383>Èe¸+œÔK<C394>ƒveØm'â<>FÌZÍú§7øžAŸrÕ‰ŽyMé&Çþw¥cÏLn¿ÂäJçïâA%MË‚‰µ©n‚Ø Ì¹”óVU˜clT[Û°[{Ñ"é½k²rÌ¶ç³JÝ(& BŸ€ò=K£ÃîU¶Ò¯<C392>ÛPží
+-> ssh-ed25519 xSWWeQ AYUPtbVlnh9XO2+6OAAC7kHTkmpr4OXpf64woW/7Mws
+icf4N5XlE/2pU5bqYExlM/bkY0/CY03ZxReybawtL5I
+-> ssh-ed25519 Si3UKw 5mohv+7KaoeBXWRgz1DmsdYAPT5lQcaonqlxOD4vHkk
+AfY4VTeM9DP794I7SmLa5Csao+r56MGay055ws2r6Oo
+-> ssh-ed25519 3UG3uw 4VoZd9YucKji3JDXwdOVVbhUsWyrOCoHhh10+DaixwA
+ssRO8OAWdFBcINEZioj5ioNAFIAR5m3rdO7wZKtEMhU
+-> ssh-ed25519 JEhtoQ R6nuIY1JaJ1OS5zbYkAJj9RvimC0izccdvskHL5x93U
+kGGiK5kchu3KcuAMybAxEMPTsGvewSCT+4n4gCto1JA
+-> ssh-ed25519 uqg2jw EHOXs57x+zMaiWbFU0NfsFBU6ygEjH0O86qqog0ypUs
+EO3EeNxjQGNwlp6r3Q677xysP405ikAGtpVMR48LVKA
+--- 1HmsJuSYEVEp1BcG3Vw37TVY2oDoNebEzppSOZ98SgA
+>Á‚âÒ³<C392>_W¦×˜¼«Ø<C2AB>®ø³óÉ×ð¿åC´Æ
àüè¬ÿ
+9Å§ŽÝ«T JíÎ¬¯Æ®üG×D+‡3zÆ…6) y"¾‰UÏ2½˜†°Y:¤„øà`ÄŽ>Åa£]×<GéVt+ôô)|Ïà¯Â#Qà¢±Ð;OY1f$Éº9ì(ùû:Ú´ßìò’éÄqQ5öT;Q˜»|\+,Tñ
--- a/secrets/lidarr-apiKey.age
+++ b/secrets/lidarr-apiKey.age
@ -1,13 +1,13 @@
 age-encryption.org/v1
-> ssh-ed25519 xSWWeQ QwbbbjPHGrJHtblFtsTYkwsmK70I4oPtYCmQB9In9iU
-MvvG4nT5Gsc35+JaX3HeLxH1Q1D/Hvxpg2KH4E4JdnA
-> ssh-ed25519 Si3UKw M1aaHjvNJp6vVS9SIpdaAsZJu6fXljEObh5wCJRikHA
-Pl39R8a0GI20MdgBU5vc2nb/BvvCOHEHCNFrUDvCXV8
-> ssh-ed25519 3UG3uw fH5ssdwj0yu8Nhyf/7qjrXNohxJuCmKGlHGhpC7r/SQ
-f/0DpUvC8A9vUcOeUoavA8zBSe96g4hL9xf76ES8tFE
-> ssh-ed25519 JEhtoQ tvihgnfJw+onTUNs0671iM6VPlxZMJJ9fA4lWoaUhn0
-IYAR+Ecyrbx6li3rX9eeYw0/1pxEj0aYOKWUu6iEaiw
-> ssh-ed25519 uqg2jw ONcHemBooTVrbF88V10wue8dvTdD/awWH6MPX7qldmQ
-atV8hDLuGp770e3nNSp5Hzl1irtIx/wP0r+ZY3HBx+0
--- S6CpK/XkPj/ks9vHtpG3V85ZEJIAwF1vwnS9RjK8wWc
-ïòøã›<EFBFBD>?“Ä$˜Ö$†•C<E280A2>é9'ÉX†‚O€È<>ùvÈ±N¾²	YÇ·Êè±ÀésÐR’<>•^é6îMR5EJ<Ÿ}Iç
+-> ssh-ed25519 xSWWeQ kU0kMdz7qckGDpxPzf0kS7uDheW1/L47UYfeZk+ZdWE
+wuXYsLuNLGmaq7rLKl4tDvPzuocnss/cwREpczJz1ko
+-> ssh-ed25519 Si3UKw ERfEt5kL5q2k2yCE7LlMvjj3UUaILijOFRal9j0Mvno
+3Cvvnd3Z/dQg4cqZWjrB63scnvb1mqll0rFxfqdtX+Y
+-> ssh-ed25519 3UG3uw 4vZT/d60cOlKKjlbE+2a1tyH2CEqlAugKjeBAZuM4nI
+e2SLfkNRysoOjpWUKs4FLyD9Tg6NKnICoeFDUPenIXE
+-> ssh-ed25519 JEhtoQ HEG7kKB8mEqF/20Kc3Oc+lxJnM4ePY3wFLTJeMiREmA
+F1ekNmqGx2mOjYo8aVWmmECtZ6in1bQpxUC+sOgrIYU
+-> ssh-ed25519 uqg2jw 7KDY7tGA34ZUNg81vgCcD7Y5SePhJbMzttiebXhRbwI
+NAkjr1MxprFpRvTf1o8EWli1klbbqoB7KIb7IUySpOA
+--- bpoDFPy2df3uszl7XG/1VXZ1ep7QNQ0re7fi5qZ+4Zk
+Ç-‚*$õ;Ü¶K;¥üXÆ¼Ò’6d&Ë«—û<E28094>+ß¤|üÍÇ"Ùµ€Ô^Çlç.¹“·ºû›òù<C3B2>¢q#<—³¡¼Á"ƒl
--- a/secrets/searx-secret.age
+++ b/secrets/searx-secret.age
--- a/secrets/shadowshocks-password.age
+++ b/secrets/shadowshocks-password.age
--- a/secrets/sonarr-apiKey.age
+++ b/secrets/sonarr-apiKey.age
--- a/secrets/tailscale-authKey.age
+++ b/secrets/tailscale-authKey.age
--- a/secrets/vaultwarden-admin-pwd.age
+++ b/secrets/vaultwarden-admin-pwd.age
--- a/secrets/watchtower-secrets.age
+++ b/secrets/watchtower-secrets.age
@ -1,14 +1,13 @@
 age-encryption.org/v1
-> ssh-ed25519 UCdOEA rwtWsO8E+vIYczz3bnBWry4sc8ygeB4GcNE4UFzCPH0
-GVWdLrXe5KZJ4eKQq5W37GrSivdQCJ1z7tYbngnK6I4
-> ssh-ed25519 Si3UKw TMG07B/y9JWgXQuugw4FBs/ViBRVcpizARh5WahZIiE
-uDrX01sid0NatPF9sD1iKjNbqpXHGWR60vhaApRWNeg
-> ssh-ed25519 3UG3uw 4aIPArWqv7oFAWjYAWL63mflRtQOOU8lTKN2e7v/RkY
-4swNcTLBb75IEjmslVGP8wRpsrntKNXWRcOP6WK7NqE
-> ssh-ed25519 JEhtoQ d2h3cYseF5RTvi+baQUKN+se6Hbdgls7WgaKZr/gHno
-dp8tfODTA6c7hAuAZt/4v3NpC1RBFXFUezojtE7flig
-> ssh-ed25519 uqg2jw VjDmDfwEt/ncUWUPYJzHt03ZIvS3PupBkqWMJkH+axs
-LzSbSqvqnsbVP2UbLrVJ8zKjzC7qJ7Z019LiqvaFyEk
--- hI6XyEO5eVfA5r/6p3A5o9+pFuvjPc/F5bD8yNf+CMw
-Øu	£3i‹üý‹}'}îmÇ°èa<C3A8>r G±Àímg~nÈ…²SUü(+òçëÇn¤^	îãüèÓH›§•Ÿg¦á1Töqƒ)<y|±¸;r|£_õ|Žë€xÜOìøk>òïò¿RRÐ¨½[!·ˆ°N…B
-ÓÏìb<EFBFBD>×°ã8G}od¿q@?#@<40>·&Î4º
+-> ssh-ed25519 UCdOEA Noal+YwgnLLtYufQC80Vcz6kcApF8MXc6daNXtN5NxI
+RNxi1EGDP6Yw+8Fms1yy374o5dT5ME7Kur9LeUVDh1k
+-> ssh-ed25519 Si3UKw KuZRSy14hTM1L3y91SJkg/RCZKwFBb57abd5SAYA9FA
+tsBO4q5PFVaQJomm1Pc/gk9rSMT3rbLwrdZp6sdZEtE
+-> ssh-ed25519 3UG3uw 3JPnjziZ/puUb8lMcXKIxcm1FCAZ8ov2Oz6BRE50qjM
+QaN3UkQVsUpSRQltBwkveZNnlGnBFXknQ3UG1pTIzVg
+-> ssh-ed25519 JEhtoQ 6MF95Wjct6HZDy/Y8pF7wO+yMTrkg+KXtwZIZJfU+XQ
+S854WSBNljf25lGkAOwDP1OpDPfu/+higpO78bl+ZUk
+-> ssh-ed25519 uqg2jw 3HPI3ZGiTQtojyz1LXrD6zMcpVIrp1GLyLGjPyDubFQ
+QoaBtmW/8kF6UW+/IXN2z0+Gg3KgwmMMiO3uF4sqOyE
+--- bNgc4v/GjwtYU3n001dwo7ToJKBRzog9lzrQOqtb94g
+xÖœ×úB`^ßÇ2ÕQ]?”Y<E2809D>ƒw*\c¿œ^xsEˆ,v”RíZ.¤ï+¯áQ¿nS*&	t+SËCª ydÌpåé®Ÿ`‹m¤g–+ò"”˜g„es6ZC¡sÀ'JÜ‰Ðµ´ÒešÞ ‘tY¯8ü¼²g !…@¿ôŠ´ß™×ÈÎkÁ{u§aýº÷Uþ