home-manager/common: Add nix-tree package

nixos/netboot: Mount /boot via kernel command line
Working "shill From Home" full network boot
2024-06-29 23:42:31 +01:00 · 2024-06-29 23:41:01 +01:00 · 2024-06-29 23:12:21 +01:00
76 changed files with 1592 additions and 1090 deletions
--- a/home-manager/modules/common.nix
+++ b/home-manager/modules/common.nix
@@ -199,17 +199,20 @@ in
          file
          tree
          pwgen
+
+          minicom
          iperf3
          mosh
          wget
-          hyx
          whois
          ldns
-          minicom
          mtr
+
+          hyx
          ncdu
          jq
          yq-go
+          nix-tree
        ];

        sessionVariables = {
--- a/lib/constants.nix
+++ b/lib/constants.nix
@@ -293,6 +293,8 @@ rec {
        v6 = host ((1*65536*65536*65536) + 65535) prefixes.as211024.v6;
      };
    };
+
+    roceBootModules = [ "ib_core" "ib_uverbs" "mlx5_core" "mlx5_ib" "8021q" ];
  };

  britway = {
--- a/lib/default.nix
+++ b/lib/default.nix
@@ -5,7 +5,7 @@ let
    genAttrs mapAttrsToList filterAttrsRecursive nameValuePair types
    mkOption mkOverride mkForce mkIf mergeEqualOption optional
    showWarnings concatStringsSep flatten unique optionalAttrs
-    mkBefore;
+    mkBefore toLower;
  inherit (lib.flake) defaultSystems;
 in
 rec {
@@ -254,4 +254,31 @@ rec {
      versionSuffix = ".${date}.${revCode self}:u-${revCode pkgsFlake}";
    };
  };
+
+  netbootKeaClientClasses = { tftpIP, hostname, systems }:
+  let
+    testIPXE = "substring(option[user-class].hex, 0, 4) == 'iPXE'";
+  in
+    (mapAttrsToList (name: mac: {
+      name = "nixos-${name}";
+      test = "(${testIPXE}) and (hexstring(pkt4.mac, ':') == '${toLower mac}')";
+      next-server = tftpIP;
+      server-hostname = hostname;
+      boot-file-name = "http://${hostname}/systems/${name}/menu.ipxe";
+    }) systems) ++ [
+    {
+      name = "ipxe";
+      test = testIPXE;
+      next-server = tftpIP;
+      server-hostname = hostname;
+      boot-file-name = "http://${hostname}/boot.ipxe";
+    }
+    {
+      name = "efi-x86_64";
+      test = "option[client-system].hex == 0x0007";
+      next-server = tftpIP;
+      server-hostname = hostname;
+      boot-file-name = "ipxe-x86_64.efi";
+    }
+  ];
 }
--- a/nixos/boxes/home/palace/vms/cellar/default.nix
+++ b/nixos/boxes/home/palace/vms/cellar/default.nix
@@ -66,6 +66,7 @@ in
            ];

            services = {
+              fstrim.enable = true;
              netdata.enable = true;
            };

--- a/nixos/boxes/home/palace/vms/cellar/spdk.nix
+++ b/nixos/boxes/home/palace/vms/cellar/spdk.nix
@@ -129,6 +129,12 @@ in
            hostnqn =
              "nqn.2014-08.org.nvmexpress:uuid:2230b066-a674-4f45-a1dc-f7727b3a9e7b";
            serial = "SPDK00000000000002";
+          }) ++ (nvmfBdev {
+            bdev = "NVMeRaidp3";
+            nqn = "nqn.2016-06.io.spdk:sfh";
+            hostnqn =
+              "nqn.2014-08.org.nvmexpress:uuid:85d7df36-0de0-431b-b06e-51f7c0a455b4";
+            serial = "SPDK00000000000003";
          });
        };
      };
--- a/nixos/boxes/home/palace/vms/default.nix
+++ b/nixos/boxes/home/palace/vms/default.nix
@@ -2,6 +2,7 @@
  imports = [
    ./cellar
    ./river.nix
+    ./sfh
  ];

  nixos.systems.palace.configuration = { lib, pkgs, config, systems, allAssignments, ... }:
@@ -57,11 +58,11 @@

    systemd.services =
    let
-      awaitCellar = {
-        after = [ "vm@cellar.service" ];
-        bindsTo = [ "vm@cellar.service" ];
+      awaitVM = system: {
+        after = [ "vm@${system}.service" ];
+        bindsTo = [ "vm@${system}.service" ];
        preStart = ''
-          until ${pkgs.netcat}/bin/nc -w1 -z ${allAssignments.cellar.hi.ipv4.address} 22; do
+          until ${pkgs.netcat}/bin/nc -w1 -z ${allAssignments.${system}.hi.ipv4.address} 22; do
            sleep 1
          done
        '';
@@ -81,13 +82,13 @@
        vtapUnit = "sys-subsystem-net-devices-vm\\x2det1g0.device";
      in
      mkMerge [
-        awaitCellar
+        (awaitVM "cellar")
        {
          requires = [ vtapUnit ];
          after = [ vtapUnit ];
        }
      ];
-      "vm@sfh" = awaitCellar;
+      "vm@sfh" = (awaitVM "river");
    };

    my = {
--- a/nixos/boxes/home/palace/vms/river.nix
+++ b/nixos/boxes/home/palace/vms/river.nix
@@ -10,18 +10,7 @@
    let
      inherit (lib.my) networkdAssignment mkVLAN;
      inherit (lib.my.c) networkd;
-      inherit (lib.my.c.home) vlans;
-
-      lanLink = {
-        matchConfig = {
-          Driver = "mlx5_core";
-          PermanentMACAddress = "52:54:00:8a:8a:f2";
-        };
-        linkConfig = {
-          Name = "lan";
-          MTUBytes = toString lib.my.c.home.hiMTU;
-        };
-      };
+      inherit (lib.my.c.home) vlans domain prefixes roceBootModules;
    in
    {
      imports = [
@@ -30,29 +19,16 @@

      config = {
        boot = {
-          kernelModules = [ "kvm-intel" ];
+          kernelModules = [ "kvm-amd" ];
          kernelParams = [ "console=ttyS0,115200n8" ];
          initrd = {
            availableKernelModules = [
              "virtio_pci" "ahci" "sr_mod" "virtio_blk"
-              "ib_core" "ib_uverbs" "mlx5_core" "mlx5_ib" "8021q"
-              "rdma_cm" "iw_cm" "ib_cm" "nvme_core" "nvme_rdma"
-            ];
-            kernelModules = [ "dm-snapshot" "nvme-fabrics" ];
+            ] ++ roceBootModules;
+            kernelModules = [ "dm-snapshot" ];
            systemd = {
-              extraBin = with pkgs; {
-                dmesg = "${util-linux}/bin/dmesg";
-                ip = "${iproute2}/bin/ip";
-              };
-              extraConfig = ''
-                DefaultTimeoutStartSec=50
-                DefaultDeviceTimeoutSec=50
-              '';
              network = {
-                enable = true;
-                wait-online.enable = true;
-
-                links."10-lan" = lanLink;
+                # Don't need to put the link config here, they're copied from main config
                netdevs = mkVLAN "lan-hi" vlans.hi;
                networks = {
                  "20-lan" = {
@@ -70,9 +46,6 @@

        hardware = {
          enableRedistributableFirmware = true;
-          cpu = {
-            intel.updateMicrocode = true;
-          };
        };

        fileSystems = {
@@ -96,6 +69,7 @@
            boot.thin.enable = true;
            dmeventd.enable = true;
          };
+          fstrim.enable = true;
        };

        systemd.network = {
@@ -114,7 +88,16 @@
              };
            };

-            "10-lan" = lanLink;
+            "10-lan" = {
+              matchConfig = {
+                Driver = "mlx5_core";
+                PermanentMACAddress = "52:54:00:8a:8a:f2";
+              };
+              linkConfig = {
+                Name = "lan";
+                MTUBytes = toString lib.my.c.home.hiMTU;
+              };
+            };
          };

          # So we don't drop the IP we use to connect to NVMe-oF!
@@ -134,6 +117,14 @@
            };
          };

+          netboot.server = {
+            enable = true;
+            ip = assignments.lo.ipv4.address;
+            host = "boot.${domain}";
+            allowedPrefixes = with prefixes; [ hi.v4 hi.v6 lo.v4 lo.v6 ];
+            instances = [ "sfh" ];
+          };
+
          deploy.node.hostname = "192.168.68.1";
        };
      };
--- a/nixos/boxes/home/palace/vms/sfh/default.nix
+++ b/nixos/boxes/home/palace/vms/sfh/default.nix
@@ -0,0 +1,124 @@
+{ lib, ... }:
+let
+  inherit (lib.my) net;
+  inherit (lib.my.c) pubDomain;
+  inherit (lib.my.c.home) domain prefixes vips hiMTU roceBootModules;
+in
+{
+  config.nixos.systems.sfh = {
+    system = "x86_64-linux";
+    nixpkgs = "mine";
+    home-manager = "mine";
+    assignments = {
+      hi = {
+        inherit domain;
+        mtu = hiMTU;
+        ipv4 = {
+          address = net.cidr.host 81 prefixes.hi.v4;
+          mask = 22;
+          gateway = vips.hi.v4;
+        };
+        ipv6 = {
+          iid = "::4:2";
+          address = net.cidr.host (65536*4+2) prefixes.hi.v6;
+        };
+      };
+    };
+
+    configuration = { lib, modulesPath, pkgs, config, assignments, allAssignments, ... }:
+    let
+      inherit (lib) mkMerge;
+      inherit (lib.my) networkdAssignment;
+      inherit (lib.my.c.home) domain;
+    in
+    {
+      imports = [
+        "${modulesPath}/profiles/qemu-guest.nix"
+      ];
+
+      config = {
+        boot = {
+          kernelModules = [ "kvm-amd" ];
+          kernelParams = [ "console=ttyS0,115200n8" ];
+          initrd = {
+            availableKernelModules = [
+              "virtio_pci" "ahci" "sr_mod" "virtio_blk"
+            ] ++ roceBootModules;
+            kernelModules = [ "dm-snapshot" ];
+            systemd = {
+              network = {
+                networks = {
+                  "20-lan-hi" = networkdAssignment "lan-hi" assignments.hi;
+                };
+              };
+            };
+          };
+        };
+
+        hardware = {
+          enableRedistributableFirmware = true;
+        };
+
+        fileSystems = {
+          "/nix" = {
+            device = "/dev/main/nix";
+            fsType = "ext4";
+          };
+          "/persist" = {
+            device = "/dev/main/persist";
+            fsType = "ext4";
+            neededForBoot = true;
+          };
+        };
+
+        networking = { inherit domain; };
+
+        services = {
+          lvm = {
+            boot.thin.enable = true;
+            dmeventd.enable = true;
+          };
+        };
+
+        systemd.network = {
+          links = {
+            "10-lan-hi" = {
+              matchConfig = {
+                Driver = "mlx5_core";
+                PermanentMACAddress = "52:54:00:ac:15:a9";
+              };
+              linkConfig = {
+                Name = "lan-hi";
+                MTUBytes = toString lib.my.c.home.hiMTU;
+              };
+            };
+          };
+
+          networks."30-lan-hi" = mkMerge [
+            (networkdAssignment "lan-hi" assignments.hi)
+            # So we don't drop the IP we use to connect to NVMe-oF!
+            { networkConfig.KeepConfiguration = "static"; }
+          ];
+        };
+
+        my = {
+          secrets = {
+            key = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAAaav5Se1E/AbqEXmADryVszYfNDscyP6jrWioN57R7";
+          };
+          server.enable = true;
+
+          netboot.client = {
+            enable = true;
+          };
+          nvme = {
+            uuid = "85d7df36-0de0-431b-b06e-51f7c0a455b4";
+            boot = {
+              nqn = "nqn.2016-06.io.spdk:sfh";
+              address = "192.168.68.80";
+            };
+          };
+        };
+      };
+    };
+  };
+}
--- a/nixos/boxes/home/routing-common/default.nix
+++ b/nixos/boxes/home/routing-common/default.nix
@@ -401,11 +401,6 @@ in
                }
              '';
            };
-            netboot.server = {
-              enable = true;
-              ip = vips.lo.v4;
-              host = "boot.${domain}";
-            };
          };
        };
      };
--- a/nixos/boxes/home/routing-common/dns.nix
+++ b/nixos/boxes/home/routing-common/dns.nix
@@ -172,7 +172,7 @@ in
            }}
            ${elemAt routers 0} IN AAAA ${net.cidr.host 1 prefixes.hi.v6}
            ${elemAt routers 1} IN AAAA ${net.cidr.host 2 prefixes.hi.v6}
-            boot IN CNAME router-hi.${config.networking.domain}.
+            boot IN CNAME river-hi.${config.networking.domain}.

            @ IN NS ns1
            @ IN NS ns2
--- a/nixos/boxes/home/routing-common/kea.nix
+++ b/nixos/boxes/home/routing-common/kea.nix
@@ -1,7 +1,7 @@
-index: { lib, pkgs, config, assignments, ... }:
+index: { lib, pkgs, config, assignments, allAssignments, ... }:
 let
  inherit (lib) mkForce;
-  inherit (lib.my) net;
+  inherit (lib.my) net netbootKeaClientClasses;
  inherit (lib.my.c.home) domain prefixes vips hiMTU;

  dns-servers = [
@@ -63,7 +63,13 @@ in
              always-send = true;
            }
          ];
-          client-classes = config.my.netboot.server.keaClientClasses;
+          client-classes = netbootKeaClientClasses {
+            tftpIP = allAssignments.river.lo.ipv4.address;
+            hostname = "boot.${domain}";
+            systems = {
+              sfh = "52:54:00:a5:7e:93";
+            };
+          };
          subnet4 = [
            {
              id = 1;
--- a/nixos/installer.nix
+++ b/nixos/installer.nix
@@ -86,6 +86,7 @@
            dhcpcd
            lm_sensors
            ethtool
+            nfs-utils
          ];

          # Much of this onwards is yoinked from modules/profiles/installation-device.nix
--- a/nixos/modules/netboot/default.nix
+++ b/nixos/modules/netboot/default.nix
@@ -1,6 +1,6 @@
-{ lib, pkgs, config, systems, ... }:
+{ lib, pkgs, config, ... }:
 let
-  inherit (lib) mkMerge mkIf mkForce mkOption;
+  inherit (lib) mkMerge mkIf mkForce genAttrs concatMapStringsSep;
  inherit (lib.my) mkOpt' mkBoolOpt';

  cfg = config.my.netboot;
@@ -16,31 +16,89 @@ let
  } ''
    substituteAll ${./menu.ipxe} "$out"
  '';
+
+  bootBuilder = pkgs.substituteAll {
+    src = ./netboot-loader-builder.py;
+    isExecutable = true;
+
+    inherit (pkgs) python3;
+    bootspecTools = pkgs.bootspec;
+    nix = config.nix.package.out;
+
+    inherit (config.system.nixos) distroName;
+    systemName = config.system.name;
+    inherit (cfg.client) configurationLimit;
+    checkMountpoints = pkgs.writeShellScript "check-mountpoints" ''
+      if ! ${pkgs.util-linuxMinimal}/bin/findmnt /boot > /dev/null; then
+        echo "/boot is not a mounted partition. Is the path configured correctly?" >&2
+        exit 1
+      fi
+    '';
+  };
 in
 {
  options.my.netboot = with lib.types; {
    client = {
      enable = mkBoolOpt' false "Whether network booting should be enabled.";
+      configurationLimit = mkOpt' ints.unsigned 10 "Max generations to show in boot menu.";
    };
    server = {
      enable = mkBoolOpt' false "Whether a netboot server should be enabled.";
      ip = mkOpt' str null "IP clients should connect to via TFTP.";
-      host = mkOpt' str config.networking.fqdn "Hostname clients should connect to over HTTP.";
+      host = mkOpt' str config.networking.fqdn "Hostname clients should connect to over HTTP / NFS.";
+      allowedPrefixes = mkOpt' (listOf str) null "Prefixes clients should be allowed to connect from (NFS).";
      installer = {
        storeSize = mkOpt' str "16GiB" "Total allowed writable size of store.";
      };
      instances = mkOpt' (listOf str) [ ] "Systems to hold boot files for.";
-      keaClientClasses = mkOption {
-        type = listOf (attrsOf str);
-        description = "Kea client classes for PXE boot.";
-        readOnly = true;
-      };
    };
  };

  config = mkMerge [
    (mkIf cfg.client.enable {
-      # TODO: Implement!
+      systemd = {
+        services = {
+          mount-boot = {
+            description = "Mount /boot";
+            after = [ "systemd-networkd-wait-online.service" ];
+            serviceConfig = {
+              Type = "oneshot";
+              RemainAfterExit = true;
+            };
+            path = with pkgs; [ gnused ldns nfs-utils ];
+            script = ''
+              get_cmdline() {
+                sed -rn "s/^.*$1=(\\S+).*\$/\\1/p" < /proc/cmdline
+              }
+
+              host="$(get_cmdline boothost)"
+              if [ -z "$host" ]; then
+                echo "boothost kernel parameter not found!" >&2
+                exit 1
+              fi
+
+              until [ -n "$(drill -Q $host)" ]; do
+                sleep 0.1
+              done
+
+              mkdir -p /boot
+              mount.nfs $host:/srv/netboot/systems/${config.system.name} /boot
+            '';
+
+            wantedBy = [ "remote-fs.target" ];
+          };
+        };
+      };
+
+      boot.supportedFilesystems.nfs = true;
+      boot.loader = {
+        grub.enable = false;
+        systemd-boot.enable = false;
+      };
+      system = {
+        build.installBootLoader = bootBuilder;
+        boot.loader.id = "ipxe-netboot";
+      };
    })
    (mkIf cfg.server.enable {
      environment = {
@@ -51,14 +109,21 @@ in
      };

      systemd = {
+        tmpfiles.settings."10-netboot" = genAttrs
+          (map (i: "/srv/netboot/systems/${i}") cfg.server.instances)
+          (p: {
+            d = {
+              user = "root";
+              group = "root";
+              mode = "0777";
+            };
+          });
+
        services = {
          netboot-update = {
            description = "Update netboot images";
            after = [ "systemd-networkd-wait-online.service" ];
-            serviceConfig = {
-              Type = "oneshot";
-              RemainAfterExit = true;
-            };
+            serviceConfig.Type = "oneshot";
            path = with pkgs; [
              coreutils curl jq zstd gnutar
            ];
@@ -136,6 +201,15 @@ in
            };
          };
        };
+
+        nfs = {
+          server = {
+            enable = true;
+            exports = ''
+              /srv/netboot/systems ${concatMapStringsSep " " (p: "${p}(rw,all_squash)") cfg.server.allowedPrefixes}
+            '';
+          };
+        };
      };

      my = {
@@ -143,22 +217,6 @@ in
          "/srv/netboot"
          { directory = "/var/cache/netboot"; mode = "0700"; }
        ];
-        netboot.server.keaClientClasses = [
-          {
-            name = "ipxe";
-            test = "substring(option[user-class].hex, 0, 4) == 'iPXE'";
-            next-server = cfg.server.ip;
-            server-hostname = cfg.server.host;
-            boot-file-name = "http://${cfg.server.host}/boot.ipxe";
-          }
-          {
-            name = "efi-x86_64";
-            test = "option[client-system].hex == 0x0007";
-            next-server = cfg.server.ip;
-            server-hostname = cfg.server.host;
-            boot-file-name = "ipxe-x86_64.efi";
-          }
-        ];
      };
    })
  ];
--- a/nixos/modules/netboot/netboot-loader-builder.py
+++ b/nixos/modules/netboot/netboot-loader-builder.py
@@ -0,0 +1,280 @@
+#! @python3@/bin/python3 -B
+# Based on `nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py`
+import argparse
+import datetime
+import glob
+import os
+import os.path
+import shutil
+import subprocess
+import sys
+import json
+from typing import NamedTuple, Dict, List
+from dataclasses import dataclass
+
+BOOT_MOUNT_POINT = '/boot'
+STORE_DIR = 'nix'
+
+# These values will be replaced with actual values during the package build
+BOOTSPEC_TOOLS = '@bootspecTools@'
+NIX = '@nix@'
+DISTRO_NAME = '@distroName@'
+SYSTEM_NAME = '@systemName@'
+CONFIGURATION_LIMIT = int('@configurationLimit@')
+CHECK_MOUNTPOINTS = "@checkMountpoints@"
+
+@dataclass
+class BootSpec:
+  init: str
+  initrd: str
+  kernel: str
+  kernelParams: List[str]
+  label: str
+  system: str
+  toplevel: str
+  specialisations: Dict[str, 'BootSpec']
+  sortKey: str
+  initrdSecrets: str | None = None
+
+class SystemIdentifier(NamedTuple):
+  profile: str | None
+  generation: int
+  specialisation: str | None
+
+def copy_if_not_exists(source: str, dest: str) -> None:
+  if not os.path.exists(dest):
+    shutil.copyfile(source, dest)
+
+def generation_dir(profile: str | None, generation: int) -> str:
+  if profile:
+    return f'/nix/var/nix/profiles/system-profiles/{profile}-{generation}-link'
+  else:
+    return f'/nix/var/nix/profiles/system-{generation}-link'
+
+def system_dir(i: SystemIdentifier) -> str:
+  d = generation_dir(i.profile, i.generation)
+  if i.specialisation:
+    return os.path.join(d, 'specialisation', i.specialisation)
+  else:
+    return d
+
+def entry_key(i: SystemIdentifier) -> str:
+  pieces = [
+    'nixos',
+    i.profile or None,
+    'generation',
+    str(i.generation),
+    f'specialisation-{i.specialisation}' if i.specialisation else None,
+  ]
+  return '-'.join(p for p in pieces if p)
+
+def bootspec_from_json(bootspec_json: Dict) -> BootSpec:
+  specialisations = bootspec_json['org.nixos.specialisation.v1']
+  specialisations = {k: bootspec_from_json(v) for k, v in specialisations.items()}
+  systemdBootExtension = bootspec_json.get('org.nixos.systemd-boot', {})
+  sortKey = systemdBootExtension.get('sortKey', 'nixos')
+  return BootSpec(
+    **bootspec_json['org.nixos.bootspec.v1'],
+    specialisations=specialisations,
+    sortKey=sortKey
+  )
+
+bootspecs = {}
+def get_bootspec(profile: str | None, generation: int) -> BootSpec:
+  k = (profile, generation)
+  if k in bootspecs:
+    return bootspecs[k]
+
+  system_directory = system_dir(SystemIdentifier(profile, generation, None))
+  boot_json_path = os.path.realpath(f'{system_directory}/boot.json')
+  if os.path.isfile(boot_json_path):
+    boot_json_f = open(boot_json_path, 'r')
+    bootspec_json = json.load(boot_json_f)
+  else:
+    boot_json_str = subprocess.check_output([
+      f'{BOOTSPEC_TOOLS}/bin/synthesize',
+      '--version',
+      '1',
+      system_directory,
+      '/dev/stdout',
+    ],
+    universal_newlines=True)
+    bootspec_json = json.loads(boot_json_str)
+
+  bs = bootspec_from_json(bootspec_json)
+  bootspecs[k] = bs
+  return bs
+
+def copy_from_file(file: str, dry_run: bool = False) -> str:
+  store_file_path = os.path.realpath(file)
+  suffix = os.path.basename(store_file_path)
+  store_dir = os.path.basename(os.path.dirname(store_file_path))
+  dst_path = f'/{STORE_DIR}/{store_dir}-{suffix}'
+  if not dry_run:
+    copy_if_not_exists(store_file_path, f'{BOOT_MOUNT_POINT}{dst_path}')
+  return dst_path
+
+MENU_ITEM = 'item {gen_key} {title} Generation {generation} {description}'
+
+BOOT_ENTRY = ''':{gen_key}
+kernel ${{server}}/systems/{system_name}{kernel} {kernel_params} boothost=${{boothost}}
+initrd ${{server}}/systems/{system_name}{initrd}
+boot
+'''
+
+def gen_entry(i: SystemIdentifier) -> (str, str):
+  bootspec = get_bootspec(i.profile, i.generation)
+  if i.specialisation:
+    bootspec = bootspec.specialisations[i.specialisation]
+  kernel = copy_from_file(bootspec.kernel)
+  initrd = copy_from_file(bootspec.initrd)
+
+  gen_key = entry_key(i)
+  title = '{name}{profile}{specialisation}'.format(
+    name=DISTRO_NAME,
+    profile=' [' + i.profile + ']' if i.profile else '',
+    specialisation=f' ({i.specialisation})' if i.specialisation else '')
+
+  kernel_params = f'init={bootspec.init} '
+
+  kernel_params = kernel_params + ' '.join(bootspec.kernelParams)
+  build_time = int(os.path.getctime(system_dir(i)))
+  build_date = datetime.datetime.fromtimestamp(build_time).strftime('%F')
+
+  return MENU_ITEM.format(
+    gen_key=gen_key,
+    title=title,
+    description=f'{bootspec.label}, built on {build_date}',
+    generation=i.generation,
+  ), BOOT_ENTRY.format(
+    gen_key=gen_key,
+    generation=i.generation,
+    system_name=SYSTEM_NAME,
+    kernel=kernel,
+    kernel_params=kernel_params,
+    initrd=initrd,
+  )
+
+def get_generations(profile: str | None = None) -> list[SystemIdentifier]:
+  gen_list = subprocess.check_output([
+    f'{NIX}/bin/nix-env',
+    '--list-generations',
+    '-p',
+    '/nix/var/nix/profiles/' + ('system-profiles/' + profile if profile else 'system')],
+    universal_newlines=True)
+  gen_lines = gen_list.split('\n')
+  gen_lines.pop()
+
+  configurationLimit = CONFIGURATION_LIMIT
+  configurations = [
+    SystemIdentifier(
+      profile=profile,
+      generation=int(line.split()[0]),
+      specialisation=None
+    )
+    for line in gen_lines
+  ]
+  return configurations[-configurationLimit:]
+
+def remove_old_files(gens: list[SystemIdentifier]) -> None:
+  known_paths = []
+  for gen in gens:
+    bootspec = get_bootspec(gen.profile, gen.generation)
+    known_paths.append(copy_from_file(bootspec.kernel, True))
+    known_paths.append(copy_from_file(bootspec.initrd, True))
+  for path in glob.iglob(f'{BOOT_MOUNT_POINT}/{STORE_DIR}/*'):
+    if not path in known_paths and not os.path.isdir(path):
+      os.unlink(path)
+
+def get_profiles() -> list[str]:
+  if os.path.isdir('/nix/var/nix/profiles/system-profiles/'):
+    return [x
+      for x in os.listdir('/nix/var/nix/profiles/system-profiles/')
+      if not x.endswith('-link')]
+  else:
+    return []
+
+MENU = '''#!ipxe
+# Server hostname option
+set boothost ${{66:string}}
+set server http://${{boothost}}
+
+:start
+menu {distro} boot menu
+item --gap -- Generations
+{generation_items}
+item --gap -- Other
+item --key m main Main netboot menu
+choose --timeout 5000 --default {menu_default} selected || goto cancel
+goto ${{selected}}
+
+:cancel
+shell
+goto start
+
+:error
+echo Booting failed, dropping to shell
+shell
+goto start
+
+:main
+chain ${{server}}/boot.ipxe || goto error
+'''
+
+def write_menu(gens: list[SystemIdentifier], default: SystemIdentifier) -> None:
+  gen_menu_items = []
+  gen_cmds = []
+
+  for g in gens:
+    bootspec = get_bootspec(g.profile, g.generation)
+    specialisations = [
+      SystemIdentifier(profile=g.profile, generation=g.generation, specialisation=s) for s in bootspec.specialisations]
+    for i in [g] + specialisations:
+      mi, cmds = gen_entry(i)
+      gen_menu_items.append(mi)
+      gen_cmds.append(cmds)
+
+  menu_file = f'{BOOT_MOUNT_POINT}/menu.ipxe'
+  with open(f'{menu_file}.tmp', 'w') as f:
+    f.write(MENU.format(
+      distro=DISTRO_NAME,
+      generation_items='\n'.join(gen_menu_items),
+      menu_default=entry_key(default),
+    ))
+
+    print(file=f)
+    print('\n\n'.join(gen_cmds), file=f)
+
+  os.rename(f'{menu_file}.tmp', menu_file)
+
+def install_bootloader(args: argparse.Namespace) -> None:
+  os.makedirs(f'{BOOT_MOUNT_POINT}/{STORE_DIR}', exist_ok=True)
+
+  gens = get_generations()
+  for profile in get_profiles():
+    gens += get_generations(profile)
+
+  gens = sorted(gens, key=lambda g: entry_key(g), reverse=True)
+
+  remove_old_files(gens)
+
+  for g in gens:
+    if os.path.dirname(get_bootspec(g.profile, g.generation).init) == os.path.realpath(args.default_config):
+      default = g
+      break
+  else:
+    assert False, 'No default generation found'
+
+  write_menu(gens, default)
+
+def main() -> None:
+  parser = argparse.ArgumentParser(description=f'Update {DISTRO_NAME}-related netboot files')
+  parser.add_argument('default_config', metavar='DEFAULT-CONFIG', help=f'The default {DISTRO_NAME} config to boot')
+  args = parser.parse_args()
+
+  subprocess.check_call(CHECK_MOUNTPOINTS)
+
+  install_bootloader(args)
+
+if __name__ == '__main__':
+  main()
--- a/nixos/modules/nvme/default.nix
+++ b/nixos/modules/nvme/default.nix
@@ -33,24 +33,43 @@ in
      etc = etc "";
    };

-    boot.initrd.systemd = mkIf (cfg.boot.nqn != null) {
-      contents = etc "/etc/";
-      extraBin.nvme = "${nvme-cli}/bin/nvme";
+    boot = mkIf (cfg.boot.nqn != null) {
+      initrd = {
+        availableKernelModules = [ "rdma_cm" "iw_cm" "ib_cm" "nvme_core" "nvme_rdma" ];
+        kernelModules = [ "nvme-fabrics" ];
+        systemd = {
+          contents = etc "/etc/";
+          extraBin = with pkgs; {
+            dmesg = "${util-linux}/bin/dmesg";
+            ip = "${iproute2}/bin/ip";
+            nvme = "${nvme-cli}/bin/nvme";
+          };
+          extraConfig = ''
+            DefaultTimeoutStartSec=20
+            DefaultDeviceTimeoutSec=20
+          '';

-      services.connect-nvme = {
-        description = "Connect NVMe-oF";
-        before = [ "initrd-root-device.target" ];
-        after = [ "systemd-networkd-wait-online.service" ];
-        requires = [ "systemd-networkd-wait-online.service" ];
+          network = {
+            enable = true;
+            wait-online.enable = true;
+          };

-        serviceConfig = {
-          Type = "oneshot";
-          ExecStart = "${nvme-cli}/bin/nvme connect -t rdma -a ${cfg.boot.address} -n ${cfg.boot.nqn}";
-          Restart = "on-failure";
-          RestartSec = 10;
+          services.connect-nvme = {
+            description = "Connect NVMe-oF";
+            before = [ "initrd-root-device.target" ];
+            after = [ "systemd-networkd-wait-online.service" ];
+            requires = [ "systemd-networkd-wait-online.service" ];
+
+            serviceConfig = {
+              Type = "oneshot";
+              ExecStart = "${nvme-cli}/bin/nvme connect -t rdma -a ${cfg.boot.address} -n ${cfg.boot.nqn}";
+              Restart = "on-failure";
+              RestartSec = 10;
+            };
+
+            wantedBy = [ "initrd-root-device.target" ];
+          };
        };
-
-        wantedBy = [ "initrd-root-device.target" ];
      };
    };
  };
--- a/secrets/britway/bgp-password-vultr.conf.age
+++ b/secrets/britway/bgp-password-vultr.conf.age
@@ -1,10 +1,12 @@
 -----BEGIN AGE ENCRYPTED FILE-----
-YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IERMTWVGZyBJYzdr
-b1d2aEtVd3lVb3NBamRwVFpTaTRjZFlCczk4MVIwQUoxWklwN0NrCmFFekpPYUlO
-YlgvVlQ2WDR6amZDN0ZSY0Q3WWtTME5pUmhQeks1c3dGOVUKLT4gWDI1NTE5IHVK
-bUZvUVAvL0NmQzFkY3BuYm1wMjcwbFpLRUNpZjJCaW15SEVDUDV0REkKRXFMQ2d1
-NlFBejBvTlJrcUtCYWZxSDBkbmxIdExBNTU0aC8zRW5OVWllVQotPiBDLWdyZWFz
-ZSBkeC4oTFUgO0FtJG9+RyB2IF1QXGhxVwpJS213MXBRMWY1cXlHZwotLS0gRUF2
-ZkswNlhvcDhTc2tybCs1dldwa2l6SDZZVmNkNUNjNGlkV1ZVa09pOAp88dxHGxVU
-vuFQO6JcroY9MF5Te/YV+wMc3hVxksibMnH1TWGh207prwcOWNOEz2iEkZY=
+YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IERMTWVGZyBoNHhS
+YS81MkpQR2w0ZWNQS1BXMDF1Ry9RNm5heVhYc1haMUx4YWFaUFFrCnJUM2lGdkty
+enNFQVhRSzRONzVjVEZwdHR1K0FCV0N1UHhrd1VTQVZkc3MKLT4gWDI1NTE5IFRS
+ZlAxV1ROLzhNcnNhQ1NRaFQ3VnlkRkFFSXg0UjlrUnFuejRlSFVrQ28KSUNYbndD
+T0tSWGFYT29WeW9CcTlybU9pWlZyVGw1eG5QVHBGZFFuKzlzdwotPiB3YnJOZi1n
+cmVhc2UKVW5EVFowdUJHa3R6MjgvS2FFL283K0h2b1VzVGhkSnFPL25FMndvZnVv
+OW5tVXluQXMzSDRIR2UzbnBYTWJQQgpUN1lqYi9Pd0JFajZ3RjhhWm16NlVnbwot
+LS0gZlVpbm8ydWZ5MGp1aTZUY242NlBuTlF6U1BzUSszVTdTYnNWRStTOEtEawoq
+gb0uEspmy6YU+mtaHJAEBKsAYKg5g8pR2GIy50C0HcVn9d19p1p5yA+7yzzVx07p
+Kdk=
 -----END AGE ENCRYPTED FILE-----
--- a/secrets/britway/cloudflare-credentials.conf.age
+++ b/secrets/britway/cloudflare-credentials.conf.age
@@ -1,15 +1,15 @@
 -----BEGIN AGE ENCRYPTED FILE-----
-YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IERMTWVGZyBLVlg2
-ZUdtUlFUQXBLT3B5YmkycWJnMXJyKzltbyt6K2dJK1RBUm5ydWwwCmRUdjJFSEYz
-Wnp4cGtzTXZwc0s0SUJQUjRlOUJlQUoyQ3BETXZmY0ppWG8KLT4gWDI1NTE5IGR5
-QUJzeG1DQTRLUmRwNnNSRUJRSFFtUDl5VjB0clVLYUp3R1g4TEVKaTgKb09tVlhF
-R0tmcmIxMHVHcG80RGxRTEhBcngvT3MrdnNPbmpCTlRyZW5xQQotPiA6RzEtZ3Jl
-YXNlCldSUlN2ejB0MGpyUHYzNS9OQmJTK3MvcXRDakdBVlhuUEt6SFE4QmhnWVN0
-V1JMOE1oaEp5QQotLS0gYW1OMTcxNWJrUndmR2h0ZmRDWk5CYnJjc29pSERUMnNk
-d2VhTGdpOW4yUQrEeH2E9m0YycuW60QrdlRetO1kNU5FaKXRQt46iA9lACIWD4rC
-Cx6WxhCBgz3hvm9x6iuYiiQxZzgJNK7qXcV2MBeQdivazeEbC7blAKVPhwD/dl+b
-PzBDXRXG3c3jMjeZFT69fIBGJfZrrLGKpTALVE4dTVXmQmVVQDTp19IC+jUXHBti
-Pj6Dpc7452s8zPkzZyRbasO9b4PYTwq8IHT6X7ITwbzZZm8gexDYe2SzRZ5VcPz3
-El+yoULZ92WbXPSQIP/Slx4BEZjmsQS+sm0N8AnBRNZkWVbHPF9IZRg3VjDAn2i8
-F3un5js=
+YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IERMTWVGZyAvWHc4
+a1ZnYktVT0dIMDVocVQxU1Y3bmQwckVnbDBZSGhqRnhrUm9yTGxnCnZmcGMwSjJG
+ZUdzdFR5Z0dUZUo5aVVydHpHbVVQZVVSNm9MT1YzbGEzamsKLT4gWDI1NTE5IG5l
+RGF0RzNKR1JsVlZWRmFGMjlwelJTYU9DMVM2WEJMc0R0YVBYSnJxbUkKNE5JRnQx
+UG9UcG0rZ2NLTDhid25mbzBoa1J3RFQzSmpzWDZCcURCaVZXWQotPiBHaC1ncmVh
+c2UgUjlqLUoga1AKNFlKZ3IyYnVSY2twUzVRdWxHRE1sT2Z5bit3bys4VXFORXBN
+Si9za0h3MjhpUkNvemROMDRnCi0tLSA1eFA4N1hVOGNZb25OZUZMWUthRFJoU3F2
+UmlqcHJ6S3ZCeE9zT0dXSUJrCs5Hb+UODXrBeIwr9agp/YwEEq21M5x8kQ5YDihQ
+zvH7cIRMq8wx9hDQtij0O/hg1PMLw6F5XG17t9HS3yIqP+JRUw40QYPfeRIXlf2g
+ua/QHrqcN5f3Nv69rFvyDd9khEa/Rwm+m0pVdTJVp1uNkla90h7nRpGxCzQ4tiBZ
+IWPELBTR3bVSW2hL3Uwzf1YX3w4KUBidujZLHVGd+BQY6DXeVjjESgbxqIqqDIqU
+fQnx2mp2gJMLS/yWUvLyvUI54t6DUV4livFOu9m5p41n+vsXuF4ACEP8KcCqjV3U
+hCFgJMossidwKV9Cfg==
 -----END AGE ENCRYPTED FILE-----
--- a/secrets/britway/oidc-secret.txt.age
+++ b/secrets/britway/oidc-secret.txt.age
@@ -1,13 +1,10 @@
 -----BEGIN AGE ENCRYPTED FILE-----
-YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IERMTWVGZyAyMWox
-cEFDWWUrVzJSM1o2azJqei9HV2xFY25oQXV5SzM3akxEaUJiN1J3CjkrQVhjWHY5
-Uk01eGp5Q0RKNVREVXJVZytndTM0SXNZSGIvUVp1TnRiNXMKLT4gWDI1NTE5IFZn
-WjAyR1RMajEyMnFSYnNGT2EyekROVWNoakFJQVZxaFc0YThOMHVyanMKWldrdlAv
-cVg0OTFHL2loeGJ3RHA0MnlnckN3czF4RUgyc1NjYXVOSXF5cwotPiBvTFQtZ3Jl
-YXNlIDRsSDp6eikgT1ojIGEzOFZMIFc3MUZGCkttZ3ZLNGxucnlJc01kRXFZTGpC
-eCsvRzl5WnFUMUIyTWNVWGk4SjQyN3V0bXQ4VzFuM1RjSzVMcDJkaW1JYXMKQkE4
-YWI1Mmg3MkpjdVpVYWJkczJQMnM1SVMvNkZhOXBDVEZPCi0tLSB3SVIyU3M5RHBE
-VFRtMFU4OUFLbkNjbkJmVmhlc2VsYzdsd0pFaFkrUmkwCs+h2KlXoyZ8U++A9wmV
-kh4N2YyI/a84yPGDNoFdSlXaU8jxUzolnadImXSXyB4CroqQLvGEbkZZlWqPLVfh
-Iav7Ja8=
+YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IERMTWVGZyBlZTVp
+eFhBR0hOSkN6RW9Lc1lCUUNTc2t2MkRSVmplV2xkK016U051ZkE4CktQSlBlRDI2
+ZVNRVVU0azNjVnBQRmVqeVQrREI0amlWYlhhbEVKOWdkRkEKLT4gWDI1NTE5IGV0
+UXcvWjg0YVJCN0pGeXR4cnQ2VmdvMWRqSmpsZ08vUkFVejRHQStCUWcKZkpLM3Uv
+RXA1dGdTRms3L0FrM3piRzU2bTRaczRlL0hydERMUGxFOGNCWQotPiBTLWdyZWFz
+ZSBINl4gJ1xACnM0Mzk1MGF2Ci0tLSBtYzJJQUZwMkVSaWxlZ0VMRHh5U09jNGZ6
+YVEwc0tkNlZBRmNucEV3d29FCvd8zYn+WWCKfaO/eJZgTOzGK6VGrK7HMnmRRGbp
+SmD48NagOvcls7+w6XKJfjjgLqrr+4QIuMEZOwbjwDwUXZAE1EY=
 -----END AGE ENCRYPTED FILE-----
--- a/secrets/chatterbox/doublepuppet.yaml.age
+++ b/secrets/chatterbox/doublepuppet.yaml.age
@@ -1,31 +1,33 @@
 -----BEGIN AGE ENCRYPTED FILE-----
-YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IFpCM2U2USB5WDhJ
-U3BNdEFYR2xVb21wQmhuM3h2TWpwSm40aW5ycjJJZ0NQNjNEdDBNCllpZlRtcjFM
-UE1TbE02ZStsMk44YVZ2T1piZmh3REFlV0Q0RWVGMERaRkEKLT4gWDI1NTE5IFRz
-T1grT3ZMRmVUaWhFU1BJbnpDTDYvRUUwUTZYUFQ2OXhQbS9KeTlUWHMKQU9UaThT
-bHFaYXM4VWhPU0xBZFI1WDkzdzlQUGlJNStjT2UwblZ0S1V4VQotPiBbbGBjW3wt
-Z3JlYXNlICUgRiVYCk4rMVEzMnVMSTg4VHpPcTIvRkZZd20yMVlJbXdTK3UyTkVn
-V3B1OFZiNCs1R0F0WmFYc3BDaW5FajNCUgotLS0gajBSMklJUDgzZlNFTlFkZTFm
-amNxblljWkVsc2w5NUVZM0x4VGl2NWZDNApDqGhViG2eQSuIEEwEh2rxVBAVkCBj
-EXUYBqrcqlRFRT+cN8EM+aT6ppUeVuuOv3aTYx+tM2M2yzjWvrckeVj0fr5GwpIT
-vZaj2yceTl/6M/Z7fK5AT7SqFp/sxSJZcDWInPcPc3MfvcSC5ca7UFcTd/iqtpgD
-gSkiDlYrZKV3PtLrp/WO06q9zrBAiJbeBLvHM/Ym8ctSl4w/SjETDmhm3LzbX+Ow
-uk/hSuk9m+pTeBPJ6CWrUVHVLitcyk2YwLwLRLvGQAQF6xQgEtL3M/pGsQp3Q6TA
-ju17Kmh+kIdkgEDj9PzA8Q7QfxU3WdC6RoIXEuQQHVcJd8IAT8i3ZuuI312sXeX3
-7+2Rav480GIF+5bHQGJkvBTvxj3OFGUuyREFO8nXaGwUrcdCfmkhuSs1TGZj6qZQ
-xVUnp+k9X6gH5xYjka/c3Ov5rTKE7CGqJ1VBdZAcuIjhH4D33RmaVmTg7SquXZc8
-cHqaoYcB/s273Wxv5qZUEfEz9ssJCxCqEOG7uQIeXgLsp7O5VtvEJfCo6Q7boN3h
-Qom+6LJfnNMew2mwLQS4jV8abrVXTcmH9cA4OdtLtTO/m123AlamJc7Dmv+EDYLV
-qu9jm2Dk6hz+jgJ5ruDFPyAaxcfQqEBFbKI0eB3D6qu3YcN49q8+JI05aTDyf4T3
-8Mv9oe0Jlv7Gf3JqORw6dhDatyRzc2FrbkpF7mwxtLTDPKsgCBFNIfVitZdXFxN/
-adu1nSBl6APznPJJZ4Xb6HmJHb/mDCeWmwt4fDwQlg0d6G8EFGYexSZOjA8yxXlr
-vwhaPYldJsxlkL24nRu4wUFi3jkEepU/KsBbYMgAp2+DIzluzKErvZh2WUAr96AH
-dMWdNlbmhNKwM/vfkzonZ1jSFIuad7c67cWo8nUFVxKU3tAjMFTgrasHzPyLK2HC
-WJnEpmMvQsji/blPVR7AOEAzNXwpOj0N/erPCtWp2v5Vyfs/ej/sLGp6tfCdZeUv
-13aNG8pYtQbHgT8qekVKRsjRlCyVYWd1lFEd3rqldtX6z8oT4cIj/c6QYzC1Rwxp
-aNPqMA3e3da9t4kkHol05grDPy+5fQ7/5B5kfbidHIjCoA9DVUEh70QYuNi4JlgM
-54Jh1v3N3+525YmavPbuwgDGsRkz6Sh5padEWFQ2Xw6B58Vgm6flA1ZSXNSp8bK1
-3g3lyCJSimFT6B7Q8gyf6gNJVpZuHrAEexCed3qhK+Ijl2SIvsTFCWLSokOPeX/F
-cy7xQ94GuLZqPedDvZ8wVOQ3X1/E46lWoY1w3qzD5l1OHuDUqJcW1ae8lXTmh8Z0
-kxRFPfNaJA1y1NaD33t+gis7SA==
+YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IFpCM2U2USB0b3pq
+Q1hPakI5WkdMYkFWWWZQN0RVTTluMlY4cnZONG54cGJvUkNkamdrCjV0elB4T3Rw
+TU5FeTU0ZS9idmIyWHhyN2Z0Smx1TmRJbXJyaDlWb1NxaGsKLT4gWDI1NTE5IGhx
+am14VjRuLytLb2VHQXp4NGorUERaSWRXQ2NuMXcwbDBwUEhvUXA0bncKbTNyaGpo
+TkZSUzdpcHNvR3YwQ1NMbjRuZ0RmVzU0YjdTR2l0RHFhN3dVYwotPiBgLWdyZWFz
+ZSByMyJ0IEE7NEViXHhHIHxnMk99IFM7ZwpVRWFlbTBvYXI0M0ROZmlFZ2x2MUw1
+QThUb3FqalZ2Qys1bXdwek5yMmdJSUI1bjVQN0JLb2F3U2NWUzlZUHFzCldoWmt2
+MVhta3hocWhGbDQ2UmdvNStLaVQwWVI4Q0M3V3hlTzhXaGRGV25kU3NwZ3Zra0ZN
+OVY0Zlk4M09LdHAKCi0tLSBiUEZyRkhKU0h0NVV2SENZczMzZWVJeUZncnJHcHNO
+VXVjY1ZyR0l5OUlvCuU6ngVGt/cxi5/ky5PPV1UvRBR4D13wCLhDtc/uDmG/fHeR
+tVl+u4aeOHYm/K1sCRWCFGXzrF5Wo2CBVNP8NzDtgSBATwgLSyIhRe9r6MH/Pmlp
+pYDZ23/pLeylzkLmKu9g1Wo6j2Y78k6ec57epj/uwBRtMVRLNk67UmQ7b72wwsIh
+0hxLQBPTJsjymkJLSJ21KkTkr++PIeyBL5yWAXpx6OErL5JiZGfXFfd7QFq3DCo4
+FY5CrCT63xqzA2bBA8TtgJA6XfEpUyVSOB8t0CnyY2/SOdHK6ZHKwam53/ieHtPQ
+HBJHCYex/hSeugJ+OtdK2qF2/pXTPXcgL4p5vzMBf2xuSwoaBmPX1wvrDT17PrcD
+3lHGyQ48crEfalMFt/AXjJI1EjLj6N7YMvCXiw3h3m0o06402KQySt9euuYkvLnd
+JCg3qFbJeyOks7NQLvtVr7B/9A0ksaOLRoLzWIqZ9uS1XneeS2HS3V7MA3gf+1Mb
+rhDl51svwZcYKy2mUjX4BqR9s/zuFfW+4EmyJ/TyVuAxDRvty0QmKlREE7bHejEp
+xeX0qhhs/87gURpZaHu+pZyeofRB2FyUQy5UF6GnCzQMw702ZnQhGcNAfN1ioIYa
+VnLqVg8OtUUvatZgPywpW+RwjlBkvOGgWBElmCtdJNU9rmPUq/GZwyFuBf9BgIis
+UEdA5R3Kt7W+4HL0oLNtL+hXX5g2/8iSyuYgmZ2WMdRJHyY4TDYQ5hL4iL+53ea
+O1CIlNNIsUJdNHx5IjyO7gfFt0UiQEtKmJgPBrKMTeVAipbZG+3pW6yi2WvezswJ
+R/6hNR+t6CR45wu3z9rSv6S72HvP8QChxrtLo0A0oOnFx34ioRxhfv00tG0GEPCn
+smPo/Obp6VGr+5clwqQFzlKz4KgMI8NIWDRDTJBZ6Pl08ut3Nz/mW6aUQxkcAovM
+7KF88iBHT46FOeGEZmCjQZNTNLfeO8cM6SM71y/k882+Zy155G+DsHKHx7+NtiDf
+mIYqX1mexeTIEDfDlIiJX5xvgHewXUch+PQZYW8Cm7A2oJESuPLwqoY18+r0u7d
+OYAf37G0cXB4vtngtrShgfbqda4f0s9o2Y06Ovb3wkegLIb8eTGN8pLU40rbprVG
+UNctWsA1VXd8Un7Dzq2JZHN94wvf2lcYJc9Lw/Dy3VIntyAg0sKkWqEgwKnQM1s8
+s8vxFyEeCacQWIX44r6/XeOlyzIsKOTEpmJpCkC52BGiMwv7nvMpD9cmYnn6wFGt
+XerPeB1lQiV0p/GYxuby/rlpl3eYbw7GL55CrlvLQK1YuEaT/ORKRRb0gFubrTSM
+eDja9oZ5
 -----END AGE ENCRYPTED FILE-----
--- a/secrets/chatterbox/mautrix-instagram.env.age
+++ b/secrets/chatterbox/mautrix-instagram.env.age
@@ -1,15 +1,14 @@
 -----BEGIN AGE ENCRYPTED FILE-----
-YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IFpCM2U2USBhVkhZ
-azNHVFdNUnJ6MVpJaGo0T0h0L3ZMbHB3RG9Ic2ZZajQ4amt1S3dVCmo0YnZxL0p3
-Y2RHVWFUSVlySTNDNThYMks0aGdOdHdGQjdrRTZZdTFpdlUKLT4gWDI1NTE5IGxZ
-elhYTEtMUHR6VlR2b0VwM01XNnFNR0tuK2hFenlhWTIwS3hSMlVIR0kKbVNLWFRZ
-c0ZrK3YraTdhR1IzL3FxMEFQYndsYm5NUmpDd3M4Sm43aUJ3VQotPiBuZ0BNPnxi
-Ny1ncmVhc2UgUHIgJ0hvbT0oCmMwcmVHR2dTd3VaSFpHUWh1ajA5M1FUTS9WQkNQ
-UzZqK0JETmlUOU44eFQ4emw0Ci0tLSBhT01BQ3VVdHBQK29GdmN0VEtoazNCcFpY
-WFhIeTh4VTlHeDBhcG1lNUhrCmxtBrEH3ornrPQi4eIIOskkKMTDs1Ow3Z70WuEd
-FyXGsYXFwpibxFxAWWLwAYiq7cMTEE0GmYRlNYt7bWwJn12Kv5LVZCL8HXTNXCLl
-xf0za7pHvXF8XWaZwU2eMMZRdkzE6HNnbLt+DB0TKS9vf33i7tmwduqJ8oiUtTRD
-XTm5IPyULH2rikDuDm0aAvaZhSFlzPIe1MKr93ZaHGrvcnbzhADyt5DRmmDuYSk4
-SSSrhHP3P0LB0OoMGVU8DM9O7QNVwScs07T7ll238Jc/JG/KHj1kT2K9LYAiNl4Q
-JfhOOA==
+YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IFpCM2U2USBiUm9p
+OEMzMElsQmhJdk5yRkYzUFoyTldxU0FrVDk2b2NoK01rQ05Md1RNClFQM0VrTFBk
+WGtMUU8yR3prN3NpR254ZFRNSjNQYTRwanNrQzN0ek80bUEKLT4gWDI1NTE5IEJx
+WXZwWlZ4dFRMTEZCZ0JTNHFSWms5Zm4vSzdjRFhBSHJqeXhDMDBIVW8KU1VaNTc0
+bHFtMGxab0N3L1IySHlaM0RwQWM2Mm10cDFEaW1UdmFMTUVHTQotPiBiY1VjUnd+
+RS1ncmVhc2UKSmtJS3QwS09HaUtUN2g1VGY2Wk9Pemx3RTdBOEV4K281bFZqCi0t
+LSBhZUxiOUVyVGJEdkp1Mk9uaFNzSEozQ05DdFpqdkN1ZFgvRzFMeFd0R3Z3CllO
+0SHrUFQNV/oKtgY9bEZ60IdlJclVst2wNfpc3z96aSMQRO2kN0ehGNR3YDg28B5f
+fccsUh1/PAkasRCqiVjKvrzWlTyIWIV5XdXN1XfO5Ny9I/LldKRDCIbNnFu4IWqg
+k22RerhY8+6BzPszQI61tu84URwMgTSM9y0jGhdn8WFf39FgIOM9L0Hi+a0V7f72
+zw54+vbACUdNuXH/D3R5h/xLwaO1cyEzeJVXtdC6VkT+XcotAcMUU1b0FcQMYB5k
+R/d31u/SeXqjFrGiTaj10TjCMZ0kz9jLBkLPPhPBSw==
 -----END AGE ENCRYPTED FILE-----
--- a/secrets/chatterbox/mautrix-messenger.env.age
+++ b/secrets/chatterbox/mautrix-messenger.env.age
@@ -1,14 +1,15 @@
 -----BEGIN AGE ENCRYPTED FILE-----
-YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IFpCM2U2USBOb1dR
-V1hVcGZMRm1yeUtKTUdBdkVjazJsS3l1aHR1Zzc4VGx1SmVyNHhZCkxZY2RLNW1m
-eFVzRG00eGN3eGNoOGh0ZHhNZWZhcmxoVzV5elM4bGdxUTAKLT4gWDI1NTE5IGw3
-ZThQM1JESU1lZk9Pc1ljanU4dVUwb0xuZENWSFcrZ01vejhRT3E5ZzQKTXZ4Q0Zn
-OWFHb0xoZi9UL1NSUWNEQytmd0dqVXFydUduYnZGVGhKK0JVTQotPiBPc0RaXl5+
-Wi1ncmVhc2UKYUtBRGZhVlY2MlAzRjJ5YQotLS0gSllJbHVXbDZtZGFac1JqN1I4
-bUdyNSs4c3VLSEJUVmo5VkpZVmkzRzlHOAow5ki6UNCCQQt0YXMr6OGjsDg9yYkH
-ssU+hO1wKXepVj6QSROZubLLTyV4Cm5rHWESMiSGTV3rcGNDUuphrS1va+stkJqK
-O7ZHP68QmCPLdlu1ghNXw7etm0K+BqqQTpPfgrusW9emUV8gIY5/SWmK6hDQLR/T
-ibC6GqP+ZCEQOL5OgB59PUCKwEjia6O6xFKPHVLNzfhg4ZmMCNNS70gqpTFRyN/E
-s9HMiwYVuvKjEODV9kM2jhfTTD3Ri10SmHurBqdbpzWhOoLz3oMTQTyW206Air/G
-8RoM1RYcVS3DI69rNg==
+YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IFpCM2U2USBubFN5
+MHRvVCtqYWxtNzJrM3dBVDJPWUc0anloV0tTZlhwUEh3SExVQmxVCkxiQSthaExG
+Z0VrV3NOTHpzNkx4eDVKWGpYdEVxMWhuTTcwa0ttL3dsQ2cKLT4gWDI1NTE5IHEy
+OWl6MzNqZGdkN21BVFdQR3JHdmxRSnFPNXFhaklDVWZzWnJ0QXo3a0UKZGlHbk1G
+TlRCK2h5VGZJd2E5YWlhLzcvcy9nSVorbk5KR2NTeE0rclJzZwotPiB8PylGLWdy
+ZWFzZQo4R3J1MHdZbVNMZWZFNWNuOVN3QkN0SFVjbFoydWN0STJUTUk1N21ldDZF
+MnhGMFExMnlFQWNLVVdQMVFDVG1mCkdEQmYvVkxDQzR5dUpDQzNnUm1yK3ZEK0p6
+dkZsVmJTVEpURitRCi0tLSBnWXhmUjJjbXBNTndSN056QUJiY3pabUhoc21mZUY5
+aVBmZVE5ZU5SaU5FCkdH2p99e4weWPUnqNPlxBKs0CD8wS7iCgOD/FtWaToTMNlU
+7jSQZhXr+s4Sq4B3WG3CIT0Imyf3toEoxuLBv7iMR/pGi+bC+ygwxwTxC8rOmN8w
+NGK3PzKVrr/XPDFmwfpkHdgPVWQYvy02FkS314wu2bsQEcUn7bpZdztmBzrJRl6b
+3C7CEop0UptyQgMOD0UkulFXHyEvFAShoGKJnO1PUDSLq1gLCooNLJ/kdkme1bzW
+UjLW3pz30kVXorL0vhSucteMjnc5WnX/KOiCqStVKN8QhFkPjEbxF5DRNRTsYzYr
 -----END AGE ENCRYPTED FILE-----
--- a/secrets/chatterbox/mautrix-whatsapp.env.age
+++ b/secrets/chatterbox/mautrix-whatsapp.env.age
@@ -1,16 +1,16 @@
 -----BEGIN AGE ENCRYPTED FILE-----
-YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IFpCM2U2USBTZGdy
-cnNwTkkzOHBlcngzYTZycE11RlljK1RtSCthVkxSa1B0SllGZW1jCk1RbzVSMldJ
-SFg4ZlFnT3ZJTTlsM0lWYlRTRkdMZU5YS2FpTmxCaVNSOGcKLT4gWDI1NTE5IFRU
-RVF0NXV4bFB2ektiQVN0SkFvOXN3MGZFeDdHK25NQXBqelBvaVg3alkKaWhCRTkz
-S2o5bjFWQ0VuZzZxTGpsOXBRajlGSmt3bURQN254SXhyRm8zNAotPiB7MFM0TDEr
-Si1ncmVhc2UgJG0gNkggLAppL0RJQnJRQ09yb3IzaTNiQTBBOGlrbjEzNjhBNWdU
-Z0VFZ1o1OEI5M3lOaHg3eW0xQlUvbVBGOEpwRXdDZlZXCjB1SSsvZmZtSlU2RzhY
-ak5lcy9FbjVlZlVmMFUKLS0tIG5ZMXZhMDYrMU1DOThYNEZxTnI1d0I0TXlNeDU3
-ZkFoWnBVOEx1WjRmTncKZcV/oJCkeY+Tp4Xwdy5s+vuMpnhy0cndBUE4KrfkX7xd
-NXTWQ1mQdy9W5MII8s1aFtxYoShZPsoNTikzZIAqxhTMHloUqKaAG0XKCKj1ZzcV
-WMj8+IOnPD1y7uwETg7l0lw0u/L2bb37zrlvrf6JjA5b4iO79+wg9AvJigdbkNou
-gfNFyZuxaIwM7FOakVWV8hKhKPYd1X0y3cUQCSb0/oiogHT+9KREXsL5Jt8hVoQ0
-r0asxVOASXxVRkEDQDe9RHnEMEo3+UOBtAB0DVSeGOa4LEt8SEoCfas5vo+LqMZs
-fDA=
+YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IFpCM2U2USAzQldO
+U0NtR3lZaGg3Wk1sUFZFL2VBQnV0c0t5V3VRd08vSGZVUzRyaVRzCm1ud0lvQkU1
+TmQ4cmNaNDYxU1BmeERNRURnL1VtTUthMi9oQWk4Wmh1amcKLT4gWDI1NTE5IEwv
+c1ZlOUdRSGFRSnNTMklVR0pSNWl1cm1nSVAvRTYzQXdqM3JZM2RsUkkKUmFjcG5j
+OTVwSlFyZnNxTy9rMC9LZTJUU2VQbW41bWJGQlVGbVpqbFNWUQotPiApKy1ncmVh
+c2UgSiBOIGxWYS4Kc0lrN2ZVdmhEaFoyNjZzWE1nVUU0V01iSWh1ZkdmcmE2YkJ0
+ZmNHQWFDNE1LTkVOM1lZYXFpTFROL0gvNXhQKwo0WDhlWDNzbmpGcS95Y3Fadlo5
+bnlieUYrUWVFcnpEbGpBTHJWRWcKLS0tIGZOajhoYmczc0VDVGVheU9GWXFOVWJY
+ZXVPb01lMThoWWpjcjJJQUYrdzQKu7TpvAxtz0QAGw3UI+IOq7uHo2dHuvL7i9GB
+9PET2JogH7Ay3g0asUmqJhFGrRRDK9P2KOX9ONHOcAatOt4IsGT3Jgsm2Zm1uGOJ
+1dC0vj0vNCbRMhidE0Bi7SRalh3RSyidiTwWZqDevTsnPHjMeJSUQ7Mav8l4BvcZ
+JLUwhfnTb577uGO1x8xiSTaeJ5AIM7DaVHcI0OuTJ+nQfkIUNL4eVtgPvxFzxp47
+fFvupVShi5/nOoPxGLN2Iadi8zvu6Fyo3R5dSHA76J8UPJ0cq4PWo83JbveaNPHM
+427s+94ShVU=
 -----END AGE ENCRYPTED FILE-----
--- a/secrets/chatterbox/nul.ie.signing.key.age
+++ b/secrets/chatterbox/nul.ie.signing.key.age
@@ -1,13 +1,11 @@
 -----BEGIN AGE ENCRYPTED FILE-----
-YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IFpCM2U2USB2WFY2
-MzFnVFYvb0wzc3grRDBrUi9teW1tNmx5dVBIRVc5OUdlcjdvTDJFCmpJL2tlYXND
-bVJKbzd2S3JkSFVMdG40MS84V0lPTVJSNHVBQlNXSkN1eTAKLT4gWDI1NTE5IFBM
-ZGo3L2VlNUZqOEE1UHBuMHdqc1pyYlQ3R29ucE9pajU0bHMzamlXRDAKcG1Qdmw2
-cUlncDFWNXBOWnpIeDNZSFA3d1E1bjNaVVpKU3lMRjRaSHNtMAotPiB2XUh8eF4t
-Z3JlYXNlICUrO0cxIH4gaTRoIF81SEpTN0Q5CnpWdEZpb1hZa2t5YkE5RnJFMHVZ
-WkhkQ2o0eWtyOE9ueDJkeGd2aUhmLzRUUGs1aUc1NURIOTYxczZhOEVmT0EKd2xk
-TXFHN051d25PQmtNUVZkVEFGUVliZjdmZDF3RWFkaEhNTzd3ZVd5N3dlNzQKLS0t
-IGZDR1Mxd24zOW05bitzQnN5WWVOOGtCNEc5aXIraEF4eXFUQm5CZUdCV2MKd44C
-/Trgg0OEZ89/jqbj56z/Hia1Ka3ZsEv6bXPI/kcRvFDBFTgtvG3KWCgMBtTUHXzY
-TKBPoQqrUf7plH7a/mTx3KR+4Y+yF+1i86s7TzYjD8d1xfFH3BsVtg==
+YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IFpCM2U2USBYZ0o2
+STVhRGNoMUYyaTZkMmFIRXQwNUZveS85ZXY2Wmhyb2U4aEZUZWlFCnBzc1l1dTcz
+cER1Tnh5TGlLeG5IcEMzNEhGSVVrV3JTdEs4ajBkUEtIc2MKLT4gWDI1NTE5IHNn
+Skw0enFTakE3Ly90NThlcm84RitDWDl1RURTSlIveWE5TzlqTU1CelUKLzlMTCtP
+QWtlU2E0dm1QV2NHSndVNnpUbEVDR3V1OVpBdGpqbTMwQnJxVQotPiAoRC1ncmVh
+c2UgJz9yb3opClYyMTVUWEFnSityRi9nCi0tLSAvOVpZWGJjQWtweVkrUmFVYy9Z
+Z3lXeTh4VGliUk95WDFzL0R2ZC80NWZZCjzgQLewxLJ/OxteyXXioIMfjbXlKiZ9
+0YZo/t4HWWRfqIruSWaPkXEiT7knXRAFPkec5vOHOk/MlRZqAVUf8edvFHYh1JWs
+iiog8wGk0fJ6qNqMSYJKwGTUvfM=
 -----END AGE ENCRYPTED FILE-----
--- a/secrets/chatterbox/synapse.yaml.age
+++ b/secrets/chatterbox/synapse.yaml.age
@@ -1,30 +1,28 @@
 -----BEGIN AGE ENCRYPTED FILE-----
-YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IFpCM2U2USBuQjBY
-K1ZTUzR0SmFoYUZLdzUzNUt2M1B4RFdPZzFkcW8rMWJLUjVHOUN3Cjd3ZHdMSzdp
-OWswditVWUhYNjZCdjV6M1d6U3pNak5hUlZjTHNqSkZPSk0KLT4gWDI1NTE5IGNG
-ZytHazJQWTExMjNkZWV2aDUwcnZjUGcwcXRkZWl0M0F2R2JpUVlJekUKWTFlbkEz
-YlN6dkgrMmFFcmlZMjQ0b2oySjlEMC85cUF5QlA4NGF3blBKRQotPiA8M1hbWS1n
-cmVhc2UgOmlZJFYmJgo3UExzUHhSVi9lbVRjNW4xTnVaUTVGSGVDNzRUNlJ2TnVu
-U0wrWU5kd3dyR2phcUNVUHJCYjdzeWhjNVFOV011CmZMOVN0WDk5eUg3ajhwbStQ
-aHExT0EwblpreTBXVHh6Zk1HRkhzcmFQNnoyVUlaeStMUkgKLS0tIG1aY3Zadko3
-V3pDMGswSDZCeit4SVhSRCsrZVRVZVkvQkNsQWN1MXFMUGcKcK74YULWqWw9VvkI
-NH38VHfDPW5ueSiyHHKn8MI9YosPr/TmkwgKd/DOIMVB74ahPalo1QUeg+eaBVnq
-Uncsbx5ecW3JswthkAhiktWHcdHmioGD6hCcgbWtfA3VvbAYc2gtAF2plfDVH6BD
-c8veai3B15ZmDmq3b62sgVA9JUgbFaB1eRqcaPXmNgQJR4c8J+CZWXGQ/TKMqtAg
-chCDuczjLX8IxhMPF1gdCggSt5GtMhY47fpZJRbBUw01l8koqjm63KvEeg2ejFGU
-+tXonI4jm2JUxlDTqmNSrVpmAgtPoEPszHc+GsnyNjAz4IXMm5UrQAZyDPgxtwQW
-ZAn0IdOB8rSL/AnRGUpPrecuauINQjONe8CapijjJPQK7g1AHscfxr+OJD1j2eV3
-O6TNlz8vKW4t/V7CUf46ykxxExhA0mKJ53ksaXy2+HWoro2+c4nao/bEld5gt08U
-uCpJtjPKB64X6vdzbY21/l87VRDyxbb3poENfrXlawqS0Z7i2gAbHN5EuiMv+35o
-sBaR0BfcbTn6VagC3i8HEEOO964FrW65pkqmGJcJMgUdcZSl+Y7gHMjWyodqGPOY
-evT6xj4iyeM49vXynV2vrJRu5rr02hOS/8rPphV9c9q9ju5n8xbhS6IiybAelPwt
-sa+xM+w0n+fxVksiXeFj7qD1LDN4+kwqhYP9SlzbA4fT3AkYYrxthTww4IFAweyQ
-IJkpVL0/IZEIEfRzpr0lWLprAaoyPc64pecl0z/gBJDgz1kSG6iEh6K4qx7ahGde
-kBBpS2I2ZsdBkvmQxDSM7tYYBzPxcUNZlSFOIeUy3Xl+OGPlKgtMofbnjV8AFqUf
-tOpgKpLUEkTgXbGUKBxHLj+8pbw7zOFp4sJ00i48ZzLP5D9jom+jS19wGshRc7cH
-dK92CctvrfndQ85yO0vqlyOdMTqjh/z3P2KmhL5SW6P51q5mseTvj7FNM7331DTs
-rq7XWaBLE61eWWQ/dZKnqh5YbkSlU1+08Rl6H/vCU5hTC8fht3KTQSWPofkrP+5f
-We/Pe62LyhV/MbLRA0nmU7Sf4IAnpHfa4kLtlYeB3xiqKd0McM//qzjuk5NoIgE4
-nL0T8YXdGt8K01w+nt+j5bo5gFoRz5+1/ZZ9BgN2DOo4SClYnJWQ/x80X061yJ33
-0SGv4eAC3vFi6xE=
+YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IFpCM2U2USArR2kr
+YmM0TDU0bVhoZlE1ajBmYWdscXk5TXM4Ylpydmd6ZFB6K2VvYVJFCnlMZ3Y1Nlpl
+ZFdkSTFIeDl0dEtnSFlKWWs5ZDZ2andQYld2eGsyem1SK3MKLT4gWDI1NTE5IHZt
+OVp3Q1U0WS8rakpVSHRwME1iVk9jRkhCaFNIcTFFVTdhVDhjb2JiVWsKV01ETlVp
+NlM3dnpQRFF0elI4OU0wWm44VU4wbGlEVkZOR1ZGMTNJZHNyZwotPiAhPy1ncmVh
+c2Ugb01BdCFGLCBBICUgMGE4OFlGWgpLbUUyMzB5NwotLS0gNVlvZkhISEMveUI4
+TXJpVmFnK2FkdFB1UFhETk1hQXE5R202MHI5MmEyNArH8iLdJN52W23zEKH1f5wZ
+6xfMYH/WHoAxphv4PFDMaGXXx5P8NyMCy4w4rXbohPpoT9oMmJbz2Dt48q0MEp8L
+tdbiQ6OhM1iyQQwbZYeU94z9EcrZSOld+HdYDReQyAAcVCs37mvmqcTIzkdG3dSf
+g6BH0Dn0jSOO68lUZV3Mx5kpPNE4VcN1BItJz2b5fJZ0IdvdlOfHyYV6n8qiP+R3
+4CnaCz6w2P1uksSWAuzmDyouIXUbJuixDf8Ks0HNO65Ar64cb0XAzkuVFbVS6B+f
+Ucu56KkLslsfFabq85C1r1naueuXbbgDKmBkleLbEkK8JunReg49XF/po48iLeZp
+11idYaFMtphmDkL+1WOzzKWGH2YaZXW3KjEcEeFZOdSUCq7gJnHb1nDfmwCcQKjM
+8CsI89ypLIisyM6uNoQNkAlRoiQ6FgkHMpO1SfJcYjHHWIsAWhC/dflUvqkVcJSy
+UOX120f8MQKUxxa2ozC6eFHunjB1ozAzWMx0Mi+h0zVzaAIS/oJNZVBVhnCqZwTu
+6Udw3JWObBRg9N2GkfFnq8iRdithya9PH5XjT4OnF+OfKfYP+MjMTdfZ+ezceTnB
+xMeme9fGhIjo2hYYCIawC0ga52XPTHDfa93fK9WA3fVy/Jatl+V/ezU8DHGANqaR
+mUjOw9ducJ6Qu9cr378Os35zHKQ7+VUugqtv5tkzxZQrpF/dcrYnJRLvMFfKWX4u
+2UctW1zmbwKaIvvo8Rwh2tZS/RazdSV3X2bYESk3x+ozZg+Oo2uRavm7qpYa+ASX
+YtAsG5j9NngFTOVH+hN7Py5rppNgHVS9kKAB5rflTvPQ8nk5KMdSxEDaq50z7vY8
+lZinF59SjN2vIyrIyybU/b+KeatSeLNoT1XPqTDi2xyPYlhn8nU/J33/4QWsqufG
+WaROcQ7elAEdyp9R/ioAB5EK2rUONlZy7ijPvXOmkc9c9z9x0RfoF4FkoN4MyUPH
+8AlrW4m47K/jw+17eqZ5iZfLYQzQrhjC5eBWIuhCHy5Qr2VpwLk+Z2pdwQRA4OR3
+8WSMRf+a4qFpAcCoe0nBNFHyqMq+5r7DvHm+eFzjJ1hBU1Jzes42a9T9IlBHKZPr
+WUTyu8Z/ndt3moJpFUIHEVxbSXLqqsO23W9hhNeg1dYg//LGs+VMM0O10WZQmsIb
+uj3YyOwdMA==
 -----END AGE ENCRYPTED FILE-----
--- a/secrets/chatterbox/syncv3.env.age
+++ b/secrets/chatterbox/syncv3.env.age
@@ -1,16 +1,14 @@
 -----BEGIN AGE ENCRYPTED FILE-----
-YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IFpCM2U2USA3MEFh
-YURySHY5RjVQa1c0QmMvTkZtZElNd1BIeDFpR1U1YXZ5dndnclUwClA2M0ZYMk90
-RmlCZHVISkxZQTZXeEhZVUROSVRGRVg4TmZKZytSL05FcTgKLT4gWDI1NTE5IFY2
-V2k3S0VQdGlQZ0hkU2ZoSWdOUG9rQ0p5Ukg3ZHU3MXVvNHlWYVN5VVUKcWtoWDJh
-LzRwcktWUGQ1bnJvRzVBVlpHU3NhdzYwUDBPTmx3MFNrdWNQYwotPiBKQil6Km0t
-Z3JlYXNlIFdlRTlUU2cgVlxLIzUgJlVyQiJ8Cng3NzF2b3d6MnlEdURQWHgrSFJv
-Y1BMUkZyelJSdDJvUUUwY1k5R3ZBMnJaa1R4NWxlUll2azNseW5MQlpvVWUKYUdN
-d1ZscXVxd1dxSGpzMjBYeWhhYyt5ZlNkSjhmV1ZTTDBTCi0tLSBBTG45VUJOSXZv
-N3lYNVlyZldMVkpZdUMvS21NdSswVmU3VThZK2M2eis4CjwfWWJVR9Ty5dBXEr5s
-U+QrifXvyMJJvqOKEfMYYomFLpt/VtbDAUwNlqLnFIk1VZ2xPUBisXPtReiCK3gq
-P+i6bUONSmPYvmF82VgiuKDuz/kmWqVGg2iSBPIXAGLNIEojndQwmhnrsN9ex4Xy
-lBHkvVsN8EamUJwZ+FEZe4+PjA5yEnANWpeTELOt2gA92/jwwnNIsr07eVTlkh8X
-UmQ2owGwktXP7it6//NV3C7sAdazs2bX65WSnog2E8WPNAorKWI8RCYs33CshVFt
-zzclZ4hRmlAmqMHYqFY=
+YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IFpCM2U2USA0cXhJ
+U0R6cW9KM2xwY1V3Y1VKVVBmcEFmTEFQRk5rdy8vZWhRZU1CclRzClJsc3ZablBL
+ZW1Va3N5aEtyMUJmWkZaOHExdjBmRDJPcVlvanM1dFMvMVEKLT4gWDI1NTE5IG9I
+UGc2RkNsNmcwL3NLdkRXZVE5UFI5eGZuSExocmEvMXJ0YkZaNzhsbHcKcWw1MTJR
+cUJCTC9SR3pNRmcvT0ZGdHBwdU9OZVJoK0dacVF1SkdmQjlkZwotPiA8LWdyZWFz
+ZSBRW3hICkc1Qk13QzBkRUwxQ0dkQ3UwNU85L3E2M3ppTjVSUnNaNExYTU04dEd0
+c2FlVStOLzRLQQotLS0gWVgzSDFUUDd6RzJjaTJUOTgxSUR4aFF4YjB4RW5xZW0z
+ZFFnR3czTU9vRQokL7wsRHEdFXrihqXGE/XPNNJ1qgHskz4bJI1Vj6dAsvT9CRkS
+GT7ZtnRwYxL+E37f+MXCQdCbfsL07wVcLrVE3wLSyc5i33/tBvMW2jhFmCVwkwDd
+aLpI26s6p5HbFniJK4G3zFhc+UXdSYfjxa0fSL06f+lmcqSol01nUu1gyiMrVMQn
+RjxhKdgyoNE6xAUD10e7KbnjLgKSe1lXaapcuoIXIELf7cCbZpi7f2AE0H0hc0Nt
+b0iBFTN+zN45tvOiTA9qRRVlBjf4ZKMDKWGXIkq8F8VXThGCO/bk
 -----END AGE ENCRYPTED FILE-----
--- a/secrets/colony/borg-pass.txt.age
+++ b/secrets/colony/borg-pass.txt.age
@@ -1,11 +1,11 @@
 -----BEGIN AGE ENCRYPTED FILE-----
-YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IGo2N0ZYUSBoYlRq
-ckk2c21uMVZSR05SdlJpck5MT0FZeUpLTmpTRVN2WDkxWWxmVTBvCjlHZWtEQ2Jh
-YUdybjJLWkNsZkxabTVIR0JnMno5YlMvVmhodDU1bktrSzgKLT4gWDI1NTE5IFZT
-Um9lWXhqRFFLTWdNaTR3Sm1acmY4N0l6WE1FSW54ZEtQcEE5RHBRRHcKcE5KYmp1
-WVdCVk0wMHZ2SCtUR0xKWU10N0xETXlXZmgxcmZZOFBXYWtBawotPiBlRm1gKGxU
-LWdyZWFzZSAqXF8gOkU8Tm96IGA4IC1TCjY3NUgKLS0tIDhjaTNrbG1iQ05iTWRS
-UzIvNzA5TmVGS2ozZmYrYjlBY3J4Z1RRUGRNeWcKUTIEhWqr0fOODu86MDll7k3U
-ThgmS9nlcUY3fMgXzZLtpHIJ/4ZSI+miu8RmLMaeC61qv6xNThGdx+MvU4tMBWKA
-Hv3XGi2MYL1jdHh2KYg5PgdqchYuHrFuBPS7c/tQow==
+YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IGo2N0ZYUSBSUzJ4
+VCt1bmtmL3dPTDg5YVo3a1JtOGsyRGZuSktadlJGbG9SeFNpbWgwCkRtUjI3TjhU
+MUtjUi9VTU5Mb2piNTFvWForZmZHZWhmZE1QeEp1cG9rVUUKLT4gWDI1NTE5IC9D
+RnZjdDBCbFVqaC9BKy9lMjhrOFlkTEhtQTdFMVVNY2dnTDRlYVUxRGsKWU9icGRw
+UDRjQmUzdjZqTkFjMGFNblFvM1pEOGZqc1o1TlpqNEc4VHZxNAotPiBMJFxgOU4h
+Jy1ncmVhc2UgUSl6c1lYb2sKS0hIOUZZajJmczlyYlZZeAotLS0ga2hSYU1wU0I2
+NlY4V2hFRytnOHlIZVBaUFk2VXdmNnNsTVJJK2ZwWnFiRQqNbSwUc4uw8BIFGgAW
+jiH2RF9iQXxjbl5n0leegyOs6ViBwDdIQ97sdA/QcEUDPMc3+j22uIIvHF74rvPO
+v8572JDMAb0mPutee/CzkJZOiHscGhV6FCRH43QX0rjQ+zpZ
 -----END AGE ENCRYPTED FILE-----
--- a/secrets/colony/rsync.key.age
+++ b/secrets/colony/rsync.key.age
@@ -1,82 +1,81 @@
 -----BEGIN AGE ENCRYPTED FILE-----
-YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IGo2N0ZYUSBZVkFh
-RDNNZCtySlNQTTZFbzJvZmF2TEZKVUM5VjFjQWNSeHlNc1JNZ2hNClVac2pEdWdw
-OVpOTmhWWklVRDA3UzZWWk9QVG1ySUFmTzRSVlFReVdFVFEKLT4gWDI1NTE5IDVD
-eWN2S29aWVNVTTdldXFxZG1vWUNYK2RrajI0OGNGaklzdFByTzlPUkUKTmsvdTE3
-ZFBvalZsdENxR0VnV3FVSnFxTitBRlFWR1BzcjJWd1h0U3hpYwotPiAyOkUlJC1n
-cmVhc2UgIWFOMiogVDc8IFZETk9BSDVTIHEKQ01rc1ZoNXQxUDdtWGRQUlRCV3k1
-djNZeEtOaUl6Tkl5TDA1S2ZXWTFQZEFiV2pWMDJpZ2dkYXdBOGhSTVA2ego4UnBz
-ZGhXcklMd0NVWlhsc0Voem1wUzMyREViUllCRAotLS0gMU5GQjdJaVdlUFJGMG82
-YnZCUm05ak9qcmVyUVJSS0tHaWRRTld3ZkNPMArRgojrBQvlyjMhChn8jgUNDysj
-9Nh3BVqf44fiUNMKARTrFTz3wVMlioo6MmKRzJ/yj0fWkZ2h80X68Nq3rQvy+0UK
-4PNPRbwY5ib0nf7n3itFKjehrYr8HnOjreQps4it52bT5re2TWIC9ogZhNKBLRvB
-qv14HjcF5bGnia8TgSU/8nUZJuIaLwHvS5sc9GOtmV4lDwiSTEJQEtGh716Jzuvs
-XxQLPEVVufAjZUKLp+jWUhXGkvUEeY5bxE2aOLuB8kLfHPC/5p2rl/n2sW3oEDFn
-Fw+XcNnCHWBzk3DlzKZFXwIaZL6Ocqrt+p8CBpWoNhbssuKyOtEbWQOmJxX3UPMt
-sBFNdKSKFhoBQ4ukqkKDhgcm0i+8wG4eBbNIMIDwzPBxK0QiVriwlPQHl7RS2M/J
-LgGeS7qrKC3SgmLu57CdUVUlnogJ4oOg7FPh6x+jQBIIv7gtYCzJb040TUZWZWvi
-cfKWBBwLqLa+7Y6kEhcosLUgw2c9Et5P4rvNjU598q7qrZq7uK6Mr+PMwD3Pd66O
-SQyT4nYhhXBnaIsLXZfima2nRzPocaBmfsuXQwlnLJC8JB6yzqEViK0xYKfl0fIi
-jxuYBw/8Y+MWQhIkF1pP8z+Kw51QdK4CIV33mlLBJnGjlizewsjj04EIgpzQ0+3I
-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
-sAtksQHMt1Njo1oRug3+/0iC6XWEig==
+YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IGo2N0ZYUSBSOE9m
+UWdwRWZGdzRObTJuSzI2QWxZSWtYNHFCbGZtVHNaY3dPeUg3OGpJCndQbzVVTWtV
+aXlwb0pWK0g0ZFl1MElOWWFDMnc1cVBZTDV0b0NMTmxTVmcKLT4gWDI1NTE5IDQv
+dktPREtiKzEzUi9UNkptK1JESWgwU0k2TFcxWkhQMkdxdjMwQnI3Uk0KWU5KKzZT
+RzJmK0RRREJ5QjgyZ0lpeGF1UE9IRjZoTFlkNTlQYzU2VVk2ZwotPiB4LWdyZWFz
+ZQpNSm5jdDRuU3pCQ0Y3QVNMZisvZHk3NEp4dXAxS2JvRGZlU2htZWVCRXYxWXkz
+Sm1nN3laeUJPTnJJZGlHWjNyCndKRlRmaDlQSVFwLy9JUQotLS0gL1NEWWw1MnFO
+V2pDcDFIdVIxZ1ZHQXQ4aEN6TDA2LzNVNFdsdml5QXY0TQokgptIWQ47Gd9dI/lZ
+j4aoLl/OrydZBlq3cu9bLw+N9pdZsFjWBXT7+k1UwbpE5LgCrq+4ybgNyWHBxiko
+DRuKVWQ0gwHpQ3WzQ0Jp3ftwHWJvm5n71AQ9EWDwg2UdlHbNcF0A7wGu6S93lKZV
+I9zNRXlAPfwfLn/xhUiWoImh9nrhs9segV4gnDrrLT3lPLf+sOVEAUp+MTaZDZPt
+UhEtVIjxAf/z8B2+M3FFsMLkD68KjK55JxpkZ/1sIMquz7hcgXQfkOAz7NF7AvDG
+EyMnKGFoWgVAxtRy5zkBgc3svT9tRLaFe1ZjcUNJ4dd2ZeaUhKalCvJBFgUgOp1s
+a4Yxz6LuwVd/CgoquB78NOp5kiF5HCGzstKo6Z7ROeY6tGcYb7KZr7gmIikgnNhR
+1YG/FkxQ3N3p3RqFHzbgTVWoCNBdT7wIvjpnL/R88VvssO6O4OeTaJlax6CwhS3x
+szWJWEnbGctzBXIGgrXlG3gp14U9dt4GJCpJEcqdhqD3Psc4dzdbXpRW66EW8+sE
+ZJDOTDRdGAr3Ds+ZTZAHwyQ18WLk2S8M2pNVrgXKB2iYhMaElLwN9QMno2gptajK
+YrBelPfAwBdnWL5yG9kmQ/mxOKQCNLzZqqsED3tw+VxDXs4d0nPU030ipu+Yh7YH
+LcmSjyoBVMt4ziGGoijvzP4vpgYGBt54dnPYiByrRM1K/qoZoDAN49+89qWk+t8l
+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
+1q8rx6T3AzqyJngzClYUTFe9EOLNwTlovhYyTw==
 -----END AGE ENCRYPTED FILE-----
--- a/secrets/dhparams.pem.age
+++ b/secrets/dhparams.pem.age
@@ -1,35 +1,33 @@
 -----BEGIN AGE ENCRYPTED FILE-----
-YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IERMTWVGZyB3QTU1
-TEdvbFNaUmE4U1lCNzI1dlloVDBTNXdURjZ2akRMV0R6dm5ST0FNCk9YclRSakhT
-NlV2UVJwak9Fa3dQNTNBK0xKWGlkNXdwZTBEMm4xZzc3azQKLT4gc3NoLWVkMjU1
-MTkgakk4UkFnIGNBMHNrdG84cUQxd1lqQmJIczlScU1jNk52Y3BtR2tXeDNWdWRX
-cEFCR0UKVU5vem5MZUFPbGhoQzJTYnF4OTd3OW9jYTRkazdocVJkZ0pRRGNLek93
-cwotPiBzc2gtZWQyNTUxOSBnU3hQMFEgQ2RUaEUyV1ZGbGRtZnlIUEtTQXk5MUZF
-djYxZ0hBUThlV2tXTHNvdXpVSQpMdiswMy9QNUtCb1hkbGRqR0Nia3FXTzE1ajZL
-UXljSTZqM2YvbzVuWUFzCi0+IHNzaC1lZDI1NTE5IFZGY3c1ZyBYL1NrRjRaRnFn
-RlNLdWJ3cThteDM3WmNaY210d3RmZzhCYmNpVXBwVGlVCjBkM0IzZC9zNjhmTTZV
-R25ySkVoQWxQQ252WWFlWWZFMlc5dWtUN3VvVTgKLT4gWDI1NTE5IE8yUU1pWGFr
-NzUvZVpwalB6aklkWmJGWUQzTnJiRjNzdzY2MUp6MkY5M1UKR1VIWDVyTFpxem5F
-TmRNWE9zZStLanRTdlU5d0NOSEJKdWhDUjBCdy9vOAotPiBTJCd2NyFYey1ncmVh
-c2UgfE4mYSBXfms0TC5FPiBiYmx8IGRFV35mciNoCjVZdHRiVUtMMWxEMlJ4b1F1
-TGgxY01XTlZpTEtndkg0T0hRVjlqVUJGMUpSaE5tVlZWR3VGenpkUXY2eXJtbmkK
-ZCtqRVN4dnZENXdoYkpjNHRWYXkvN2laY1p4YjV0WQotLS0gOHlEVTVOSmlNemNQ
-TW5ISk1DeDlEM1RoQ2JtUFlyTXRKQjdnT0hiend2VQqrUFvr+76sKn0ldBmZMlEW
-U2k85DLo2KU+/+GtbkZwVXxxIZHMLpoJgghHk9ptdalUgLGcl0X15x9jVaw8aeta
-hbeOHotRHY7bC3z0S74riTk3xDMR1eT0QGhDMWHjfo8SkCftOYBlFfhTftevdep3
-pKMZsuQMwH9JzxgUfcxIcWE975cZzrEJ85nfWMGvdSjcg51KNxP/UUPRxDlcbCEf
-9XX5apSzNsTI3ibGD1n6Qwq8bdVYDMHmy5pAhw4l8L+SdoU1tGdw7JOA16sMCJbx
-T4bV0ky/PGRonjJuCyDBj8oe9vMe1ZI1O/ITtktekS+wocxBs6QXlY7pIZMlGUn2
-6m59ZEEaf7R4/MdnmBDNDkQuyXaKc7SaTc6h5sKWzXdYScGUKvgUQ7U/WJ2ItUTC
-N/Xq07GkZZMt5MYBlyEr+/mKWlcy+ylJPGb7EswvQWaHoeM1QF0XLZ1v+W/Xsso0
-seIoz+geSu9a02kwfsa8WvWXdIAT5X2pNGPClVNzjQ23pfQfQuW8ZQrGmIFR4g5A
-58T1K+vGLdShqqVGyJFMVrSuOzqX5FVmZalu7/++1IQfiRGUlrHKoPlKWnCfFEOu
-AYjaPeEFX2ByxcqfMK1YVPvUufdISUQeaQOO7mXGE3FqB0oUqmRIUiWZATwhq3Pw
-p5QdcySTnmMpD/w05hvwski77kCdmYuHlMlLZez/kfhTnIGXris+Vwi/V19bsZ8G
-zwaZ/Xr6WNC+df5JqSfTGREnXZPFRDkaTt3ri5/eEm6BqliuYjGbuiKsDECi4+JX
-bHpH6LBBoKQ6ms7jCAn0Ls4cUKF37PcjGAOuWnzCSBU+REht1EDfHzx4C7hNiP8X
-87NjEqJbwE9lORho0hQJRTn8uriQcidlVoB3se2SYKbMy8UA4NNnxN9PTj0TuQjL
-OD3LtqHBElqNPbGNyyEAAJmMBmmkUvPPXlGQ0D99b1+jIdHzYSRtOLshBFykqWYQ
-LJD61duhGqcQqcLx4+JdQ+oVcfAI2nG7YINnHB0OmS2DOZvvwqQ7ASScSujUWIjA
-LNQxu3ruMz+bw/G0tYZBBiE=
+YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IERMTWVGZyAyMHdi
+VHdHcE1uY3plMmE0VHd2bXF5S09aSy9XSXgwNVhIUUcwaytkc21zCmRXbEZRRHVm
+T2p3N3ZTNnA2M1lZdnNlaTZNS2Rka2h5MWE5bWxMN2QyQU0KLT4gc3NoLWVkMjU1
+MTkgakk4UkFnIDRtMDJJTm5WSUh5S1ZtZXljNmt1c2JhdERuOTA4WU1iWC9QWVl6
+ZSs5VFkKSDd3RE9hK3RMRm9qclVySDNGUXFjVFh1cnFKUXpmaHo3QlRqY3MyTHJu
+SQotPiBzc2gtZWQyNTUxOSBnU3hQMFEgNXFDdUsxTHZMUmlQcFdUOXpSMGZlaEpP
+em85NGNoMjlpbjh5M1VHYWFIQQo0RG1DTzBQUmpQMGs5VTJvbEF6c2o4ZlBkOVYy
+S2Z6Wm9GM29lT2F2enVNCi0+IHNzaC1lZDI1NTE5IFZGY3c1ZyBzNVZaUkljK1oz
+RS8rRldsc0ZuQ3hpa3R3L2RISWpQdGgzQ2RuTzE2Wm5FCmZ1U213SWcrQ0ZPZGhF
+R3YraTg4U3lBdVNnZzFmL2N3aEQ0eWV4Z2xETUkKLT4gWDI1NTE5IEFVVjRJck9h
+WkNBN3JVbGZQV1lHUWllejZRY1VMSkwzY3Btb2V0NFNCbncKYWhXOEFvYjc2cEZp
+RnRnSlpRWThDdlpNQ1VxMWdMM0pCVTNPczlhWDh3WQotPiB2LikwTzMhLWdyZWFz
+ZSBeJSAmZlYqIEBgK2w6fDBWCkV0OGIrTXIzb1piLzl2Mlk2OTQKLS0tIERzdG1k
+dUFOcmJjL25MNHo3MDhRS2lCVGxzRnZnQUZDZ2JManpJTTlXcTgKpmHNMXWNS6I9
+QIuY1L705kkDEGlHghiRfciV6+vK/FxeEQpqDjR9NXLUtPCsgzlcqAjg6w4CAsdm
+2wxVD3FPutB0uZQSWdRSPZ9zG2UiwfV3cIMhZn/0OU4DqLVo/xlapiOImO3GyQRd
+ILWBnu9a9WPsSDbqp5zSgwqcpzbERurADl+J+9f7HqRSCMlA8BlpVS24wdiC8Ruf
+rB5rQ5qIzZ8YS5GVD5EHzekywnK4PbgmnXi4Gin+E68Irkwhtxqp22VnJFABsHDJ
+o4ZhM5UiJXXAnqlQfd14BUi4u8UhvY6sC3XD7NT2zz0giSP49aSBkdcv0L+vvRkv
+xtLRv8M16d+2Kzlgc9ii6jAlewuCV2ElARgdgNMizCiVgQEPHaXA5/ESmI1e76vA
+3GqdgAn86/6fbZrquQzf5jsrLF1VIzwxmUGzjDpJPZm50TSPrXX/7GsuSfhWzeEj
+6FBCgwb8+WZkwl51BFVrQpMs7m1yvMn/69ttEfg87V0nu9o063rfVgEh5TVCfTqx
+39o1HeThkonLAYKoiYAQFjsJ7i28AvcUM6m65tOBB6+QFDqGo75mptpf0iyQ7hpf
+jc4XY3IpWekOzaub7AXkLHhVFPes3JTknqF5f8dogk6bMi56DXAfYpoxlmvA8vxA
+Ucc7NvzF0MRjIy/+d6gnDaF4lrepvF4JgSW0jtP6AzghFttILTKO17tY9fZadFfa
+jd30GZ/sKtYbvfwZL1yIO3Uey1+JKrQNd24+3VZnv9vbBPRSkh1KGTIMd9/OgeZ/
+nh3KncUA5pVdf22kloNf8APm3q0ueBVCdMik9wc4vDt+dmjb/BVkjeqI/gpQ53sE
+o11OuVn53trLNisG5pxLZsEchUo87mkDrvD2c8TdE8N46GF/CyI/d6MS/OO8kwmR
+cCy4Mnw5sP8Q+ZOgfJI7ri2dAtuJnx4CvXVXaqL0dXICJHIaRMHgjKbuxsbm9pXc
+QfBZMQRyWmWxc23jEKfbWQ4Lm5d5+vT+uTprOUQTkViuqYcWh/jdIPBfzKnwzmuu
+1m+YZvbOcxdGmARmHKRWu4KTqhzRzF5U
 -----END AGE ENCRYPTED FILE-----
--- a/secrets/estuary/kelder-wg.key.age
+++ b/secrets/estuary/kelder-wg.key.age
@@ -1,11 +1,12 @@
 -----BEGIN AGE ENCRYPTED FILE-----
-YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IG44Q3BVdyBEcDNm
-ajc3a0gwYmVSdkowak1aakJ3VWZ1Rk50S1JIS0ExVktVSW9OVWljCjJqbUEySlNK
-a0xyT3NPK1BBMjZzN0RrLzhwVitvS0pzQ25iSnJSc3FmM0EKLT4gWDI1NTE5IHk0
-M2pkWHgyMHR1WHc5bE4xWTFDTndKdkhRdTg5bzZIWEU2cm02UDZBQjgKUUY3dS9p
-U3h1L1ZvTkFPdURLZ2tSYXJXOGNZZ21KVGdIbXdhSUJrd2puYwotPiAoL0RtO0lH
-OS1ncmVhc2UKVGthN0ZSU0ZFTTg5YW9UOXMwa3RnSzFlMjE2VTN3Ci0tLSBwMEMx
-Q0tQckd3SzBwUUE4SndMV01kUjVrOTdDWmxlcWs2Zy9TZk5yMzhvCrBXyLBZGuSD
-dJodNI13obTM3UvX6hSgQ8Su+J3fOKr5NibkhQ0Auvlr2tUXhhDm2WOUlHjqVTq+
-jWLSyhioDlIEyBgk8Zrl7KGeDzBi
+YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IG44Q3BVdyBCWDl3
+eTdyK2EvaVZNWWl6UmMyOXdGZ3I4M0U2dTZvZzg1SEc4MXpuTUVJClRWVjFobzh2
+N1VWeDA3eW5lcHR3TW5QUWZXbmpPTmxTdzJKa1hnTXNkOU0KLT4gWDI1NTE5IHJ2
+ODVMYUw3NkhjWWgyck9TOEFMdlBiU1U0T1JFY1lHWkFyYXlmckg3bVUKd2xmQU5r
+d1FjQ1ZiMEF4VjkrL1hiamNhYVowRFd6ZDdVWkVvSjRVeTM4VQotPiB0YH1CQS1n
+cmVhc2UKTlBTeVpKRkpRc2pqMWprMVVIcElhRjJFQVIxN05iaS9EZkFwR2FkRG80
+dmtMNTcxaHgrZml4N1pCZ0J3M3ZHcgoKLS0tIEY1THAvVm9jc0VXT1l2dkgwSmln
+QTlKbGs1MnZaL0lYL0I0Y0N6Y2Y5UDQKQ1Xo41y8MDzUvkrgJHFkrAAgVTQ/tPr1
+pDfzNqSn0NZY8rba44wDFNLv69e9fxecolA6SQ9LpKg15BS9MdRINULUKn1ZW3VD
+P1oYmXs=
 -----END AGE ENCRYPTED FILE-----
--- a/secrets/estuary/netdata/powerdns.conf.age
+++ b/secrets/estuary/netdata/powerdns.conf.age
@@ -1,15 +1,14 @@
 -----BEGIN AGE ENCRYPTED FILE-----
-YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IG44Q3BVdyBzaEo5
-RzNndHBLMUl3Z2txdVZoOVJBbWsrTVJwY01WeHQ0VTBaSm5VclY0CnJLYStYNEI5
-VTN3dEQ0ZjBKaU1PZSt3d0lldkE5VC9wNHdWazNWV2F6WWMKLT4gWDI1NTE5IEJ5
-amlzTDhCOFF0TllPd2RsME5Cb1lRQUZPTGNvOEZnL1J2Wlpnb29GblUKT2t1NFZy
-blNZSHdxZjlHTlZmaTFYT0laQ1IwOCtDZ21vTjhxM0owdTAvawotPiBLYS1ncmVh
-c2UgRX0nVGtpSCUgNVNDWCVwIDBuPjM3MwplK2cwc2htQ2RLcFhUZ0RSc21uQlFV
-Y1QwSStOK3lKYmVVQ0J5RXA3Zytaa0JoMWtlWU9qMHBLNktFZWxtbFpDCnJyS0JJ
-WEcwbndYbERreFhLZlRyQ3E0czB5NkREancxZk5BTGdWRkR6N2NrZmFrbnhSYlZZ
-NElHNEEKLS0tIGVLdXAxU0ZaZVkxaHV4dEZNNUVuc2J4N3VRMzZzTktSMDY3bDVB
-bWtmUVkKigIZ3J0s23vNzmbzJGjSMGBXK6o6xnsA9HXeQZ13VgKv5Qv+UHu+Z0g2
-TeKdQSrHbDB3ydIxaiXsi2ivULdrIMCyd96rEJFxrkVuVqSZE0ehG5j+o8lKk4OU
-PDe70slbZrVYDSu+OOUOCVRSopZreCURlYn2Pc4rjvrMAn5r1r+/AxjZMdkmmQZ0
-l0wMBTus5zZzKg==
+YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IG44Q3BVdyBrR0Q0
+SE5jV0c3Sm1Gcks3OUFZeDc5QzR4cFZqbkp4WVNZVDhWOWozQWx3CkZjQlc3RW4r
+cG4zLzFnNHpjdUs3NE5WZXk4NmxiSzJ6eEVXOXEwY2I1YjAKLT4gWDI1NTE5IDA2
+dzd5MFd0b3dSUmpiMzNwdDA3dWhwOEorWU5veDN0YXk2NUFUV3JTWGMKck5jdlJT
+eiswR1VqTlZOQzVtTGVOUzlWS2xkMll2Q054enY0cUJxOXlvTQotPiA6biFtSjRm
+LWdyZWFzZSB+MCApaEsgR1gpYiUlIH5IRWAKVURzVndnSUphTzdoWmhZSjFZNURS
+a0lOSTg5NThOemR2VC9jSVVMTmk1K0MyRnRQdUhVNzViS0ZqQmV0ZkxQMQoycXIy
+a2JyZGptN0FaT3kzendKUlRoOFBJNTAKLS0tIFNmUlFrM3U2T0lTd1IrTzUwdVl0
+S0FWMXRxV2h4SC9pdWpUSTVySWNydDAKt5pyhC3SbNgPEwRfxE2vHpiGoIOej1sL
+ar5C3X1RZFv2uDzH/Km7TWkhsqqRoOvtbxoLcZTAlKzNIG0KEwcFjpJRas86gd1+
+eZYjm3QtixvrLp2doXtTHfl3RLW/dLMVGFFn96tWlvecUPm7hwTy8ehR3xPVblY1
+5vFRZTnsh1V/9NRkFjBOwkfXdJtU7Hf1iRpgwg==
 -----END AGE ENCRYPTED FILE-----
--- a/secrets/estuary/netdata/powerdns_recursor.conf.age
+++ b/secrets/estuary/netdata/powerdns_recursor.conf.age
@@ -1,15 +1,12 @@
 -----BEGIN AGE ENCRYPTED FILE-----
-YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IG44Q3BVdyBoZUI4
-bEdWSW1pcDdMYVRJLzdQOWhsdTlZMmlyZjRVeEFwU3Z3NzVFa3lBCkxRZ1FYeU9D
-L2dramp4WFFlREZ3NTFnWUs3clVEcnBhLzExclVac1M2SG8KLT4gWDI1NTE5IHVZ
-bk9QYy94Tk50c1dVanNvNzhpYWNqeFMzVVR0eTQ5OXozMmp2VFlad2cKaEdvUnR5
-ZjhsQ1FRaittQXFkbnRZei85MmtWb3pXRVFsc0RzNzBPMXFMWQotPiAzSXJZb0RE
-LWdyZWFzZSBudCBGIDklTWIjVnwgM3YvCjRVYUd2TForc0gycnRBR05MbU90QmNu
-dXlmQVB2bnZyME5heXlyMUdGTmR6SVd5SHcrTThrZEJYRlpnUmdmWnkKU1lyNjQ3
-T0J6b3NPQ1FYZnhxTjFrYmN1UUJzMjEwcDBwSTJkTnlmeHl3WmFFTXB4eUVMWm9i
-NExUZzM2SHlLLwpiZjQKLS0tIHdqakpMSUNOdnlBcVA4RGJHR2d5QnJNT2dVclZN
-djd4WXBLSUhORktzZ2sKzMjxqL3UPrtGmXDijdfu0AwxLJooK7ZKauYvXWSuZUrR
-vl5i1QPMEEBYEl+NaZIFgxAFqWpAXHQ1VxSijMWxNjKUd1Chq0tbLrpbh9wXJflK
-SW19Wyqc9eTb8BnFoOSYWpDvAs2Lbyr2kJkOj2TNrwMv8nDJdOB8XIPlV5drCj1q
-Dx/1zWqm6NMYxsep6eZkv4AzxA==
+YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IG44Q3BVdyAzVGNn
+YUNPRm45VTQ1YWJja0wrNDZnUis0UDFpQ2NvVm5zWWxWcjBXdkNZCk9OdDczR3pq
+TkVYVmZ5N0JMZVE4eWV6Si9qOFN0di9JWDc2OFE1L2p6TkUKLT4gWDI1NTE5IEJx
+Ky8zWjhLcXVQVWprVnJMQnlMR3hxRmVHTXgwZ3dhcmxwUWtoTjBPVkUKaG0rQU1k
+YzBmQW13MlFqVGJ3YUpLMTI0U24rbjZxL3ZYbFlJdVlqOGhvVQotPiB+LWdyZWFz
+ZSAoQl5NRDcKRHhzCi0tLSBRbmNGdDBxa0p4S2NKclVNSjlKOWF2dW9XMHA3K3B3
+bmVCK0s2WldDeU5vChTZYjN3rWDIVs9tkiMrdqWjcFBFJnoHZJd6Xqd9gAXVOBdE
+tNPc3n5Am9kJqNER2jcJCuVMuoYiqVqCElWq1JNYHzzL1+jPDy03blfytPU6nkL4
+g7DkAFUyzlpar4Q8tEgjWLG5fVPvmdxTXU+pcvzwFxDa7dJqMh1Lp/1AniY9fENu
+GLK25GqhzdzYakdnEsWWdUY=
 -----END AGE ENCRYPTED FILE-----
--- a/secrets/estuary/pdns/auth.conf.age
+++ b/secrets/estuary/pdns/auth.conf.age
@@ -1,13 +1,13 @@
 -----BEGIN AGE ENCRYPTED FILE-----
-YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IG44Q3BVdyBrd0pM
-TGw1anJNaGoyQ3lMUis1cHVtRWFPcFFNZk9Cdm9TMEh1QTdKc25ZCm9VNzVQcUxE
-Njh2Wi80RWszSU5NczRNcHpVYXpRMzJNcDRsdGxyWVZsUDgKLT4gWDI1NTE5IFpT
-MEJVUkcycVFJaVFOUURoL29VT3R0MVJCWW04NXVRVEpKY3hlY1lWRkEKcENya1Jx
-VnBCMVBrZkc4VDkvMnZoTllCL09vQ0VOZytuMnRvYVQxL2FldwotPiAzLWdyZWFz
-ZSBCNX0gIiB7InIsfCAkOT9uM2UKUWpSYTZ1dUo3SHNaUlFibTl0UDhTaFh5Mk1n
-bFp2cjM5RGhqU0s0Qm50Zk1pUVZmT0R6ZjBoUG1EUGlKbHFzVwozQ2t1cWVDVVAv
-Q21QTjF3NW5UdTBZRldnL0RmSlV3QndHcDB0d0lvZ1RHTTByS1ZwNkNVQnU3WmVn
-ZwotLS0gb0Fxb2FsYzgwRjJwSUF3ei9hZVR2Vk1ORDlIMWoyZ2RTd09hUmtvMWpD
-cwrEjdaYfoGZ9i/S97xL9QvA/yii+sJLeuUzzv7a3DE661eQ5ezurV8Qz1tIhxWG
-RsOppaaj1podFx3U1x7QQbLO6zQbJA458RMjYgc=
+YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IG44Q3BVdyBPaWFI
+eUNkNTNuYTRLTjA2akFybkNLQzdaOXNCSWZFaGEyTmRFUE5iU25zCkhtZEFzU0FU
+RDk1SmRtOGpQWlgyTUVGcG8yY3pnWnhXSjhMTzFxdytZNUUKLT4gWDI1NTE5IEZQ
+bGkyWjdZZU1XZFo1WTk1dVA4UHNXWXhITjVxODFjY3BLZk5mdkM1eU0KbjVKMzgx
+MEJzY2poekV3SXdLazdjVUR3elFSeUo2N01RUnp1VXdpbVc2awotPiBYaXctZ3Jl
+YXNlIGEgaCEsTD1xCmtZRDZjN1JwK2pZVlBrQTJVRW13NGdRSzZSNXV2cG93UzlR
+YUhsKzBlZmFmdVBGNzhiV0VvSUlNV0FmMmR0ZzcKcloxeURaQXkrVFAvUjcrQjly
+aDZWQk9ETjJscEdPeSsvUWZ3UW1FOUZ6UGswLzRHbmxQalB0MWFiK0dBNFFVCi0t
+LSBZcEQ3WTZJdXB2VTdWdVl2RFZEM09VSFZ2OVdRQU9CZjY3MTlyVU1hTjBVCm+z
+D0JiEYoHVIfMwIFjA3ZWLGjNqaKfkgHyaeuBaMVu/+hSq/kToIESepC/WdX2Bg78
+MdDauw3Ne6cWCukv8uAkgznK/G92W6UXKg==
 -----END AGE ENCRYPTED FILE-----
--- a/secrets/estuary/pdns/recursor.conf.age
+++ b/secrets/estuary/pdns/recursor.conf.age
@@ -1,13 +1,12 @@
 -----BEGIN AGE ENCRYPTED FILE-----
-YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IG44Q3BVdyBHNWg0
-WGRGZnlTdEhsRm96T0ZMOWx4UUxkTitJa3hMWDE1dVkreEtEa0RVClpvR2I5NGpz
-aUF0N1VZU05oWXUzTEI1TVBLYlVVang3Zzgwbi9teDVlQlEKLT4gWDI1NTE5IG4v
-OXRIbzhaZEdXc1pjTnRRWHVxc2ZTcmozSlJkY3lyOGtvd1BVeGprVUkKdUNqSW94
-SUIyOWtsNU83cnVOTUxNR1BvWHJPczdzUWc4aGp1MjlpZm5ESQotPiA2KSV2PVx5
-LWdyZWFzZSBqezVxOHc9biA+aD4tP20mXwpwRCtMUDhmcVhGNXpCZlFmSllpdDVp
-SmFZelNhZnJlR25DS2l2MlQ3ZGFtdGxkZEdEWVNrRlk1VEZBRm9GMHBFCkVlQ1hp
-WnhOTGl2R2s5RDRKN0p5TmF6Y0cyN3ZlR2pDZlhMVjQ1c0FJN3hCbFEKLS0tIEFT
-bjFiRStXMmJueHdsRm1nU084dDRpS0tBT21ENzZFclJXbE11NWJETm8KyMHU+tZY
-QELtZCbXKWnP8QC6V84JIFAxoRslACwsIJZpogcZO/IFIV2RGunGjCJk6QBmhOPV
-kJXRcGO/ndYjWfuU0U3+9HtPocnO
+YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IG44Q3BVdyBoSzZC
+cDN3UEllRTZKVWcvWExMTlJOcTJIbG9LZVcyQ1R6MVd3amdwVXlJClNKUGZKdjN5
+a01LQnNOL1lOekNCcjRuUTc5OHhHT3lVY1o1ZWRUWlhDMmsKLT4gWDI1NTE5IG4w
+dUdFOTB6YjVnOStUYXdBM21TZ3ZiSi9sT09oV3cwOWt6VFZvYTJpeEkKeVNFVkJJ
+b2lNSXNSRDdXbVg1RjlFT2x3dW9WYnNQNWVib2J6Tzl1cWlrVQotPiBdLWdyZWFz
+ZSBJOG17b0Q3NiBWUDFrd1NZcCBEIFtRSiQKd2V0RVlRUnRad3lGV0daT25hTkpO
+M01kZVZvUVhyZjBQTHUyd3I0UktoRHVER3g4Ci0tLSB1SSt0bkxKWUl3bUh4d3BO
+Z01reWl3RVpMdmo2RDZUUnEvNzVJSzVyRTVnCsL5btAUdWO+ru0ROIgNVrbIOysH
+gfnbLNYgF/S/kH+ahA9Q4zbjq4y4R+C4zYeCVDinOXExLXqsKk/gvOKp99tVCLor
+4AFK6Ol6tg==
 -----END AGE ENCRYPTED FILE-----
--- a/secrets/gitea/actions-runner.env.age
+++ b/secrets/gitea/actions-runner.env.age
@@ -1,11 +1,12 @@
 -----BEGIN AGE ENCRYPTED FILE-----
-YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IGpJOFJBZyBOZ1RV
-VVpOZ0Jhd2x4YklMOHdkNkd0MEM4ekZiYXFKMjRIdXlZVDFkOTFZCkRreDZlK3Bo
-WmJ1MDBxSU5UYzRuUDMvdnpVc0prNFF4MjM0M1FaZmg4V1EKLT4gWDI1NTE5IEkz
-THNsVDVCbU9KYWpXL010OVRmNjBVVmVyVzhRZW5McVFJcnA3ZWJvZzQKOE1lQnVX
-Nk1rWVAvS1lpbDEzb2ViUUE4RlB5NnJOZmNoUGdUMGNuMk1iMAotPiBuYVwtZ3Jl
-YXNlIHdYXzh3MSB0TyREIGpdTjheeQpJZ2pYUyt6UC9vVmRNZU1uaDdvR2ZUNG0K
-LS0tIHNCRno2V21tZU9XV1UwR2IvZDdkWEMzZDI4V25Yb0lvdmJadXNEZFV6TEEK
-81uT8S3QJNe+mVadi/VpXSPEP0Ygzm0/+1pB5qqYlSQEWTHqS55gCyFCwu+sjaDq
-DpYTSm1JAk5ql9NRj4fJvCS53lJZ4zo+5c0iJKmuRg==
+YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IGpJOFJBZyBIMEZW
+aFY1bk9JZEY5YTN1eHNLNzh2STdnVUlFaXlqNlZNQVlSZWhkblZRCmhVa1BROTFo
+S0JNcVdzVTMyK0pNTUhlQmpDaks3MG1naHdHdGpySGl6R0UKLT4gWDI1NTE5IGVC
+VnFwNFMzWHdIZFB3K0Z4aVNTSXFaaUJpREdxZEc3N05JL21vemp6MVUKSDJEOUx0
+MzZUVVY2bGwvQjc5Z3BWOUdFZ1o5ZDBlYXZHeG82VVpHZDRLMAotPiBmLWlSentR
+LWdyZWFzZSAoNjkiU2BtdAoxMVZSeEdmM1Brelk0cnJSV2ZWSVRBK28xNDY1R2VK
+enJGeDI1eHFURFZJdEJwdE9XaEtqVDJsanVFUFlOY1UxCkhCQVpUc1hkM285cmo5
+TzNUcHcxL1U1WUdjTQotLS0gb1lIVnNWUUN5SVVLQkxPc0ZJWnF4K21TMDZ0OUlp
+ak5rZjR2bTdlVEZJSQqtDNO7Rm9G+7rOSLYzqOuiel0fCWGHPslkLj95g6L/Yckd
+vC/+s5Il9crZEJoCFO/7DDHe3KgQXcMMIKnTbgxtNqh9R+MI63CarYtoujq3
 -----END AGE ENCRYPTED FILE-----
--- a/secrets/gitea/db.txt.age
+++ b/secrets/gitea/db.txt.age
@@ -1,11 +1,12 @@
 -----BEGIN AGE ENCRYPTED FILE-----
-YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IGpJOFJBZyBBOVJi
-SXdGVDlXWmVGZUM0OTJPUWFYem5qZzAwZWxhNzhpT2t1VjdZU0ZrCjYxWUE2VW5o
-cGFLZ3g3Y3BpUWlWOUtUYTg4MGZXVHZvdVV3eU9iZW0ybE0KLT4gWDI1NTE5IDIw
-QmxaWTY0WjJFZUd6TUxqaHhRelpRQ1hGZVBEcm43d3JYUVhpTWp4aGcKVzhJdFFu
-SEhUUUZVNVk1N2tzekpzUS9RazRCcFBhb2xxbkhRNEwzVys5cwotPiBkeE19PHEm
-LWdyZWFzZQpwR0xsb05JVlFXQTZZQkJSWHY0akNRdjh1eXFnbmFDWUlCM0xLWXBi
-QkVuanloRQotLS0gZTkrT212MXdsZy9Kb1AwMkFHU3VsTElweGNlYkZ2UWVXRzkr
-dnB0SHRnYwrveLSY6SdUDO+QH7WGniLIOPcECTQ7CiTj9lwD5Hm0rYLdvizolb33
-CsGX/kSEI2bD
+YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IGpJOFJBZyBuVkFm
+akZuLzFFQk55cGdzRk5MM1dDWTlwQktnREpScUpkbFlFMHh2QkE0CmxjK1ZQd240
+RXZ4V2VsYjFURndVTnJCbGVkM2R6WjkrN3ZSQ09nL0xPM1kKLT4gWDI1NTE5IFNO
+NEJYVDVzVFFhWkFkcUJ1alZnL0w3MUFwM1JDM003Zm5Kb1QxRW83UkUKR3lkSFAy
+TjZDOW5lM0MzNWlYZ0NyRUd2VHhuenRXdzhINEk0cUxGN3hoawotPiAkPWgtZ3Jl
+YXNlIE9yRSA3TlFnLVFTYwptWEJCalNTdXIzai8zTUpFNjBKOTZXRFJPSUVuVWVJ
+bVN5cC9nVkhnL1BXNWVTV3ZNOVRrMmNXSzZPUXZuZVlxCksvS1hsd3dJR2VuR3J3
+cDBaM1B5MG02bStRWnJFUndva0EKLS0tIGlWMko3bHR3NGdCSFU3L1R1a1p5aVV6
+T2FrTmE1OWxwd0dkeGJMWHE2MUUK8hoazoNI4HD1S2GC2NRb41ZF9yf25Qr3YsZE
+ivkpLPzXy8kjC18JwwDmGez2QJV87w==
 -----END AGE ENCRYPTED FILE-----
--- a/secrets/gitea/mail.txt.age
+++ b/secrets/gitea/mail.txt.age
@@ -1,12 +1,11 @@
 -----BEGIN AGE ENCRYPTED FILE-----
-YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IGpJOFJBZyBrTW1E
-ZDFSRXIwbXZXUlNJbHZCVjFzMzRxTmdtbDQ5eWVOWWp3SEdSUERrClVMeFRLOGUx
-U0dmT2ZUUXlCSGhJdE5ibkZLMmZ2VmZFWU9PQXpGZFRPQkkKLT4gWDI1NTE5IDIw
-VXd5N2EwTVdhdkRYeVF3c201SnV3TmxnUGpOZWY5bFJaQWRWMWxQVmMKR2RNc2pE
-aUs4ZW1XSGU1RzM4bHZYQks2cHZWUkhZN1hob2d1QnM3cCtlMAotPiB0XENxMSct
-Z3JlYXNlIC5LIEIoJ1w6Ci93eE5lMUxDQjE3dWI4a05wUE5sV2dWN21ZN2lFRThv
-YVJGNXNWaEtmbjVMaXhnemVuTXhOMXFtNkQvbGNuS3oKalZ6bEtGdHcxYnZNb0Zy
-YnlGTDdoVVdyeTJpYjJjZkc3alUyV2ZGa0taeEFIYTdiRnZmYmRjR3BzNUp2Ci0t
-LSBROCtSMzFNR3hTK1p5NVhGcFpqM0U0L0MwbWpzNUNTUWUyNEVXbzFFMGpjCnot
-A6mYbp+jhpoyjZidXQfzLVcu6y34WqAfJZsfT6l5SJONVfSvSw+iP7XXW2T5OnE=
+YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IGpJOFJBZyBBTDB4
+aitJOHhDS0liamE2aVJPN2t5YlpudGpLWGtZOE9qVGFvalNwWFY0ClFHSzFENE1D
+QlIwZGVJUlhlWmhxdW1wRFlIRTdGTGZ3T2d0LzdFUnNsaE0KLT4gWDI1NTE5IDVR
+S2E4bFVLekJZbmczVnVGUjF4RCtRMWVoOE5INWVDTUFaa3JDK0htQzAKZGY0UUZa
+dDBucTZCRnBYbHAxTkZtbzF1OEhvalFuTkR5MHZzYmJ5cVl3NAotPiA/WUM7Qy1n
+cmVhc2UKeStlMFRNQm8xYzk1UDR4cTJxSEEzUEJyQkdRREoxbzdLZmhpZGwvMFJM
+RnYwYUVHUFRNQVJjZGdnbU1Ea1EKLS0tIGdjb29GNVErTHMzWHUwckJzYmd5ZjUy
+ditNZGxiRGdXWTJ2bG15QlVvRmMKbW6LYZpRKW8IyATjS56cL3io4FGo9LP9Qv1F
+wXSJ//BMnY6u5+eFyO6xqYK2C8pfBw==
 -----END AGE ENCRYPTED FILE-----
--- a/secrets/gitea/minio.txt.age
+++ b/secrets/gitea/minio.txt.age
@@ -1,12 +1,12 @@
 -----BEGIN AGE ENCRYPTED FILE-----
-YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IGpJOFJBZyA3dDEx
-SUw4QVh5T3QySHFFemo2N1JWTjNCSGRiS1lmRTkxVEQ3S1NKR2dNClZNM1Vwc3dF
-elB0Unk1OWpUb1RQMVpSTUpJUDNrZzFMWkhKK0l1dXVBYlkKLT4gWDI1NTE5IGRF
-TTZlMjdaamlwTUJzYlVkcVIxbmtybkFwakVtK2craXVBNVZraGZ1VlEKN2VvaU5r
-VjNRS2I5WE9kVDhES2dWTUV2cEVJaXZxNzRUcFo5blhGTDBaawotPiAxXCJQemxa
-dS1ncmVhc2UgcDphKHFVTGUgIUonYydBPgowQnc2Wk5yS0E1bVBCWmpOc25MWWs2
-UTR1dVlJbnNXYUVJSkx5bWFIcmtpT1lPSVE3b2Zpd0JaTGZWcEtjelFDCitQcy83
-bEVvM3FNTEhyWVVFS21tS0VQWG5OOHFza28KLS0tIEZZeUZwVGxUdEdtQTZuYk5K
-SHJaUDhHZ0JqbGNFSjJCaVlQTVo0OStkMWcKz/w0SnoHxnw71gr5DbXgMl59Kgjy
-SW4tzNGeRcX2j4YdRjr77TP5UAzpQE30tEcrtw==
+YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IGpJOFJBZyBDNzl5
+NjlaOWJ3K1FlZ3JCN0JSb3N4K1VvdFVJbURuNjM5QUZYdjdkN1dNCnVKT3p5WXFZ
+aENNVXozMEZ3TTNzbXJpamlrL0s0cXljbys1RmsyVzRBMDAKLT4gWDI1NTE5IDAz
+dUwwRGhGREJiQTJNSGRqTXpFR3JuSGR4allyOTdNL2o5WWxacldMaWcKRkZ6VWgy
+Z3I0T2hTa01xQWdWQTBwNldDV1FBSXJrL1hGN29BMVlEa2t4bwotPiAhQUVXLWdy
+ZWFzZSAnJgpYeVMreGxSUExWa0JuUFNHR3QvWnJIeDBycUVwVEZJTlpWakdxaCtm
+ckd4VkMyb3E5c3NsR0lnYm1Ia0Q4TVZ3CnMrTVRmTGV3VUM3ampPUUtmcVNhbk5q
+aXVuUjZya1h0dG5nCi0tLSBFZlZyUEZKSG92MTBqOXhYMWkyM1l2QzJZck82WWd3
+Rm9wQzhxZ3lNQTVrCoIaIO18v+FQdXXdTqp73b0F7E3xASNBXE0jmZ2GxvNAVIad
+hW4NcZTNQBvrsZKGk/8=
 -----END AGE ENCRYPTED FILE-----
--- a/secrets/home/ddclient-cloudflare.key.age
+++ b/secrets/home/ddclient-cloudflare.key.age
@@ -1,13 +1,13 @@
 -----BEGIN AGE ENCRYPTED FILE-----
-YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IFpOcUlvZyBNalB5
-RUZRNE1CTUJsbW1kSkxBSWVIcG1RUnBKd1gvcnRQVkZCUXFOQmhvClJUN2ltbnNk
-T1grdVJSTzIyNTBTTGVEckVGQXdYNHdwOU5NbW1md3lGM0kKLT4gc3NoLWVkMjU1
-MTkgcytxUmZnIHZ4bFZSS0huWFBDbUhNcTd2MFhvV0lOY1l3d3ZXNU4vT3dwMmlI
-emhoV0kKcDF4M0FPK0JpclI5Q3Q5WGxpZWVYbHVWbkNWdTArclZsN09XK3VJSXc1
-awotPiBYMjU1MTkgRjRCNVZmcXVnQnJ4KzZoM1ZkdWxYUkJTM1JuK3ZlRWJYdkFR
-WXpFSmR4NApTbU5qR3ZuN0ZmbzIvMTFsMkdNSGJXSVlrVmZPdnZvcHFiZW45SW9I
-endJCi0+IDEoIjlcJi1ncmVhc2UgJUE4IWl5ODkgfGVdLihEfT4gWCAreSduPS4K
-bkI2Wm9LRGJXdW11aDl2VgotLS0gTENqYjZEUUZaWVZEcWQvWW5yTzJEdHRLeDJm
-QUl5aytXdDE5QVMwVHZVSQo+aDbaGNOrz+hTSUQ4IAjDC9EfNwrlXDZtBqw8HkRv
-1/Rr737scjrM7Bgt9zuKn6CB0zdeHTW5u685V2hCW/3aTy1eppWMWj3r
+YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IFpOcUlvZyBaVlB5
+Ky9mc05ZTjZ1Y3grOTV3R0QzR2xKNWZhUjJjTVhWenpkdmRBRWtVCng2MmJMZjIx
+aFEwcGRFTG1YTkhQWkVuT2xMbnZtbWdMazlEUDRzVjhTbzAKLT4gc3NoLWVkMjU1
+MTkgcytxUmZnIHlyN2liK3pWeGRIdXVmOWcxUzBSRVJTSlJhcUdaWi9TRXdqZUNB
+YTg3eGMKYmVyM0ZOTEV3RENiUWk3TEhmM1hqNTRJVVIwZDBpaUx0aHRSNitEdHdo
+awotPiBYMjU1MTkgemRaS2xzTTNiTFpWeWIyRnFEZGkvTktJaGIvN1pqVmxyYjUw
+WWcxSEhIbwpJTStRUzZyUHF3cU5PZmNqUFdvYUhuZXAzNFRrWHB6L2d6VzE2R2tR
+VkZFCi0+IFhmLWdyZWFzZSBSciFXQVhXUwpQcXFqVEpKMVgxNGFXcVhlNlpGSmRk
+ejIwVVNCV2ZQNSt6ZTFVdwotLS0gU1JSZis0TWZ2U2hDRnZ2L2pjTi9vQkVQM3ho
+YWFObG5OSW9ub2hYSXU1YwpRT/yTLKhFr2QDaxL/Qu9uBB1yXyN66zG9wqBpNEHc
+2Eg96I4hBN1+TkF0HXvvhrJiQ38CDYgERniCa2+6T4qx9F+Sn6OHNM1I
 -----END AGE ENCRYPTED FILE-----
--- a/secrets/home/pdns/auth.conf.age
+++ b/secrets/home/pdns/auth.conf.age
@@ -1,16 +1,13 @@
 -----BEGIN AGE ENCRYPTED FILE-----
-YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IFpOcUlvZyBFb2hL
-MCt6c0I4Nm5SMFhEaWNZRTRtNkpYeVQvVGFVZzVqd0E3L2dZdzFBCiszUXZSVENo
-cmxqdVFwMFA0elpFOGZoM3B6SW80MEhCNlJoRXV0WXpUeG8KLT4gc3NoLWVkMjU1
-MTkgcytxUmZnIHQxR2MrakZmRFJMcjhabGFON2xQU2RBSDNvRCtuV3NwNGJ2bjZF
-b2lCQVUKcFNzM3paS1ZnWk8xY1VzVmdTWndMK0JCTU14bUJvM3E2bjR2TmlTY2tF
-NAotPiBYMjU1MTkgY1MrT3ZkN1pUd0JVb0JWSDByNUNRd1NUd2ZiNVJrc0JCb0J5
-NENrU0MySQp0bFpwRXRZcHRVdnN3eitkNHlWc0c0a0NmUjVYSVFXSVNFVHI0b0ZB
-U3kwCi0+IHQmKm9ERFdfLWdyZWFzZSBJIFkvRG5JIC9ZI002bmkgNX1hQHcKc2l4
-S0N4YzgvK2xqZm1YVkl4ZlF1REVOTGRWOVZRQm80R2NnczlsdFlhTEd1RmVoNjZa
-KzlkVXNpbGZsNTRybAp4RDlIWmRqR0t3VjF6WVlSeTJ4aGZBd1dDNEpMTUhZenZS
-WjZCK0FZcXJORkJwc1piS1FvSlkzc3R5T2s3Vk0KLS0tIDFPODlkZ1BSWEhHUHJK
-QjdZOE1KcFNvcUYxYlFkL1FLNVJETTkySVNYRTgKOipmWGTV9SvGE4KVqgQqGw4e
-CLP4PYlgdSmOATTIg32G/GVTM8NlvaII3q2GNS0Enx7Y8YwnwS2dGkYKVN3Da3b2
-WJwMiBZRu/PC
+YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IFpOcUlvZyBEdGdu
+Rlg5UG1IRFRGNXpyT25LaldEMzVtRFlqU2ZGcVN1UytVbTlwaENvCmdEaGM2R1hw
+UTA4SjBlY056NE9ha1BvZHFtcnpGbVQwWXRoNVM0YTBTV28KLT4gc3NoLWVkMjU1
+MTkgcytxUmZnIHFPc2VaS05pK0RkR3RxU3F1YkZGanZOUHc0dkplVmE2V3RaNUZt
+RjdYaWcKTFRndDVoN3hoWTRjWE1qOU9DZ1hMMzBUTjVGdmhuWUhYNFluaExETi8v
+YwotPiBYMjU1MTkgM2oxaHRUeVZQeVBLRE1kNTJwWXgwcmh2YXNRZnBKc1hvRHNG
+OXFLdG1XRQpuY3NwWUx1WE9SY2h0RDk4WG5Ba01oWXpuQ3BuNGdVeC9uanhjWEF5
+YUlRCi0+IE1LZHotZ3JlYXNlICZAJmhqKGoKCi0tLSBCMktCWkY5N3lGTG9BQ0tK
+TFhlbUZhUHJBOEZ2ZG84YXlITWtMdHNVSEJBChdTeXiW23QUC7Am0fsto/YKrU95
+GPix08xVSBgsguBWE9N0BUAqzhXSW6etfHloXx7UsIgjCKCOb5WV5G82WGFVB7oL
+Peie/FJEaA==
 -----END AGE ENCRYPTED FILE-----
--- a/secrets/home/pdns/recursor.conf.age
+++ b/secrets/home/pdns/recursor.conf.age
@@ -1,15 +1,15 @@
 -----BEGIN AGE ENCRYPTED FILE-----
-YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IFpOcUlvZyBjbUF2
-VXYyVkRud3JFU0tDQThjQlVMTTFaaW5uTkt3K2dmd1pleTFOQm5jCkNUeEVqSXVX
-RGUxcU14Z04zMlRubVIxV0VwazhlZlFtTCtXT2dVS3l4b2MKLT4gc3NoLWVkMjU1
-MTkgcytxUmZnIG5SRTFOWWVIMU5yK3VTdkVtc0VYNnFkRXFrdEpiNTJIRHBvVnky
-OHRyWEUKVXVvZlBBR0dsUXFMa2dSZ1FWVWpvZGlwcHJ3YXRscnBoaU1FWlVFYTdt
-dwotPiBYMjU1MTkgMWlBWCtSU0I4Q1I0T0JrZ1ErYzlHRTZsUHhZQkpYQVJGNnFy
-U3ZPeU9RTQoxaGZDYnRaNjBRRGQzMGNsTmZwcjhBRXdLeEFqVWxoT3hNNHk5cU9C
-Qk00Ci0+ICF8Q0EuPSIhLWdyZWFzZSBKcCp6MgpaTXQwdEllbmhRVDhOQTdpb0RU
-T1VGZmdZK1VEMWdPUXduYWQ2YWx5aDFTQ3ZzRnRWbFRGN0lWUU5iQWdPakpZCnl6
-MnI0SE5sS0x2MUZibW96SllDQVVOK2grRldPOWo0VSs3SkFUN1dqS3RqTTdPZG1M
-eHI0T1BHK1F1cWlINAotLS0gckFnWkoydklhWHZhZHBkSkN5ZmdadVdiMU1QOUZW
-VkJENWlHVWNXcEVsWQqYscIBmSi//ev3IN2ax0Ei7p8Atu4nYQui7yoY/1fiyGQL
-DB5+R9Dm4YUNHt3bjrBYclLohDGdLUnOB00BXUqNmlLm4psL4Ey5Go8=
+YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IFpOcUlvZyBCb2cz
+VXdzRUNLVDRZT0VqbjQ3VlllWk5ZYWtxY2RENXpDT0NhMDU4elFRCjhrVzQ0Y0Z0
+OEFuOHM4OEo3K3pvWjVxanZDR08wTDJieVNEeXFNQm9Lc0UKLT4gc3NoLWVkMjU1
+MTkgcytxUmZnIEw3K01RS2t6NDk1Q2w4UTN3cE9qdkdZLzEwUUVOcGtBdVZ5YWRu
+clEwZ28KTHZWQjhMa0t4dkMvVzlFcW0zWXl4UVpibjFFc21LeHlnTXU1MjQrcXhj
+RQotPiBYMjU1MTkgVzZUcW5tOGdqZlJiWDN0WjNqMFJGVnl4SUVNZC8rRG5kTVJn
+dVA0QUhHRQp6UkRaWVowNWFwQ3J6UTlJTlFVTk92ZERVN3ZkRnRUR3d0ck1HWlIw
+VlhNCi0+IFhyMVgidTwtZ3JlYXNlIEN+N1IgbApxS2tENktCWFRGdVdYRC9VSU8v
+anNFMlJFQVAvbzlrcktkVnJ4WFVxb0VWaHI2a1l3dmFMcmNDVUh5L1U4SEZJCjdx
+bys2dWk2aFdUQnBxcUlwS2FxYUxqZmVJTDAvZW4wVlU2T0lJYnR6YjVkVWw1bzdC
+Z0kvSXFhWUJ3UEdqaWEKVis4Ci0tLSBxZFhjSEUvbTc5dTNycFluUDN1SjhkRis2
+YkZnWlVBWWRrUmh6T1Q4RU1vCvVxHQ/uIqakQa8Mn9Eq7WfdXzApmNAcnGIHN92c
+O+LKqQ4Mfv5QTzYtzvUJN2jz/SDmeZczTCO9e7iOqQ1i7TrAe26SjzzjVqq1RQ==
 -----END AGE ENCRYPTED FILE-----
--- a/secrets/jackflix/airvpn-privkey.age
+++ b/secrets/jackflix/airvpn-privkey.age
@@ -1,11 +1,11 @@
 -----BEGIN AGE ENCRYPTED FILE-----
-YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IGhNYTRudyB1N0V0
-UW5ZKzQrSlFUMnR5QUE5N2Mzd0FvK3JCeFM2RVRtUklVQkNkU0dNCnJuUUxjQjcw
-NURFOFRWRG5WSnBPT1dOVjFNQWZVUjJUSU9WVTExeS9XZkEKLT4gWDI1NTE5IHdq
-eDhJSTZKN1lQRXNaZzNIWEx4NTZINzZpdFRPZWJGcys5SUV6bmc0Q1EKeGlqTjF6
-b3Y3ZWNhcjF4WlpOcXh1OHBucmNCZmp6VTI1MXRjN1FlNlA3VQotPiBtQ01Dey8t
-Z3JlYXNlCnFKKys4Y0I3RkE3bzl2NDJ2aDNMeTRTUUU4dFFwelV3SjVReExnCi0t
-LSA1QSthdHR0cVE4bXhiczZqUTNJdzkzdnZ2TEpESWwwQ3BWNnoyNmp4ZXdrCl1g
-oNwCvlTrPx5b5l0OUymxMo1HMCV9fsQ9zyaoJoPFN1hv7l4hjjX5oVoj/IdTJbbe
-ZMs1yqa7YbR4+HG9GG8nPhU36hchSN2whoz8
+YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IGhNYTRudyBYTVly
+aGgyRHlKdEpVTXRRR1Y4QU1yN1BnbnJPVm16Q2Z3MlBwM3VycFhVCklGTHFtcHIz
+Qnd4RUMrRGl5RDd3Rk8vaEI0Z1lIQVF2bmY2WldCdEpTR2MKLT4gWDI1NTE5IFhz
+b1AzTzZmcXhrdUkyS0E5L0doZ09ld1JZVzVCcjhNQzMyakFjS2plUkEKU0tEQnl5
+eDZZajV5RloxYWs0NThwOXZHVjBtampQLzRNUlhzQUVUWFNKcwotPiBjLWdyZWFz
+ZQpwaVNVcXI4eUErZm5STkxRVVh0MFFPOFY1bWhPOFVHcVo1QmRwUVRWNUhjYmJ2
+RXFMV2xsQ2dFCi0tLSBSS0xlK0R4OGN4Mm1CYUJ5TmNJQzBVSFFyL3ZZKy8vQXZy
+N01OMHFjalR3CqeMysLSZi1iWQ5U86rNMUC2BR8Y17cBq/ZjMBs+6laXxjYrLcQh
+M6PEjYQuYE1WM3l9Wq9OJDxBKbCE4i7uI27C/XlhCkwpGjTCdvQ
 -----END AGE ENCRYPTED FILE-----
--- a/secrets/jackflix/airvpn-psk.age
+++ b/secrets/jackflix/airvpn-psk.age
@@ -1,11 +1,13 @@
 -----BEGIN AGE ENCRYPTED FILE-----
-YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IGhNYTRudyB6dGZN
-VDF3ME9IWWJMQUVrbmlKeXhZbzE1THUwVWhBc2ZBQXdUUkpod0FzCkVncGlyTXVv
-bmxPN0F3ODdvUmw3Sit1cERNTXN6YWZlU2IvYUhoUThER3cKLT4gWDI1NTE5IGQ2
-RzdCWUw2N1BHWVhiOGhvNEdzQVlUanR3emdDV3FUTFRXUDB3RDdrMmsKZDkvWWgv
-MFZhbHZtVDVQSWVEQ2NxQUZrOXFMVmYxbEU0STFJTVBzZm16ZwotPiB+Ty1ncmVh
-c2UgMnpCPlV9ClY2TzJGcnBrbUJTU3lyNVlrNDdwYTd3Ci0tLSBHaU9ZVnZoUkx5
-QnE4UXhMdEg1elE1dDRoQWx4bDhBMHNwS1BlQkRaUm93CspT9YnuzfpKxC9y6SWJ
-JRyT8aFEJTjoDEqN2I/DBwRikSxKyspHi7grCwFaoofylqJzsP/In7Xlf91xbMXz
-njjXbBQQP9PG3Z2c0OHk
+YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IGhNYTRudyB5a1VF
+WC83NDBzTVdVWGVpdy9oS3dVWnZYMENIMU1BNjJrWWtEU1UzNGw4CjF3WEVDZEs3
+Ulg2ZDFrTjVXRmI1VU5oRlptQWIvU0R2ZzF0VldMeDNySVUKLT4gWDI1NTE5IFVU
+dkVKdHBjbVJaVTZWZjcrUk5aajVyS1dEM0YwVHBLZU4yZ3laQm8yVlEKNlI3WVNX
+N200Rld3bkZNYStUQVFWZi9ybDk0L1B1cXY5NUhyMUNCRzBrcwotPiBKMEw4LWdy
+ZWFzZQpiNWxxQk95Qnp4T0dsakpzWGdLajhESCtTbUFrMGJzRG40WGZoYzNNME9v
+VlVRNjhlWlEyM0tSa1RLSEZycUNNCjVGZWdCZlh6QnlpVjJjY2NSY0ZFaXBpS1FH
+QzVxR05xbFpENFBlc1UxR0lWWHZ1OVU1YU9US1pwVVE5MHJIZC8KCi0tLSB0dnha
+ZlhkZUY0ckwwN0dpQUJxbVg3dzNYTkFPQmR1MzR3VS9vS2dmNU5BCpfV2N/8Bkci
+HDA0vQv0/AZnglUxqXKnQXN3+Ipf1mBIYKlA5ZZdFGChh6Ro+LcI+b1BJdRcEgIi
+gM1CN7Yph1Aj7b1lcadD8t0u4WCO
 -----END AGE ENCRYPTED FILE-----
--- a/secrets/jackflix/photoprism-pass.txt.age
+++ b/secrets/jackflix/photoprism-pass.txt.age
@@ -1,12 +1,11 @@
 -----BEGIN AGE ENCRYPTED FILE-----
-YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IGhNYTRudyBGWFZS
-Umg0Zm44TlY2djBaSUNuRGdRSTFob290aHJ2a0xnL2ZXSE9qUndNCnBJUVNUcEpF
-M3F6UUYzanlENmM1Wm11WHllRzVyc1hEemtpT010ZjdKcFUKLT4gWDI1NTE5IHJV
-KzdZUm5HUldPdlBHcFd1L2lEMy84ZVBqL1BoRUdlTjVMMjQ0U0dmMUUKeXFDejl5
-TW5sVkJoQzFZb0R5MStoOFJKbUluN3gvTXBmd2E0MmR1ZHgxTQotPiB9SC1ncmVh
-c2UgbyBKbWN2WE1kCjdESDIwMkN4NXpxU3A1cnJLamRoUUpSN2x6U2VPaEhNODdn
-c05uSHBOQ0Q0a2FpY2RQc1hvUFVMZlJqdm53WjAKRGlvN1JjUnd2RWp2ZzN0Z3pv
-RVozT1lueWZhck40T1VMMkd5TjZOclFhamU5NjgKLS0tIFcvemlDZ1B5d1h4cHJI
-ejNuRFRERk5vU1BKbzZkUEtKSlk3K2NxTzFUQ1EK8tR8pcagaUMue5Rjz2BLNbU4
-8SL2h7FsScBnIHka3122jwjgxviwH7T0YfgHpZCf+yLwVg==
+YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IGhNYTRudyBoWmM0
+NktTeDViMGZETVdwRFdCY1hmZWg0cy84WGVzdWxuQkI3NkpFL0cwClF0cHF3RFNt
+OHZORjVrOFVXdllMdGR6UWtpTDN4Uml3ZEhxSFZzb0xKNUkKLT4gWDI1NTE5IDE2
+R08za1huaWZSTGtzYkR6cVNLbEtJQVhkcDJEemRMbTdkS3JzbVZaekEKdFprd0h5
+eVo3WkJlb3Uza3JzMmNmZ01qWUtIaXpOcVQ1Y2w0MEZxandBbwotPiBNLWdyZWFz
+ZSAtYDU/NXUtIE4vaTlBJTwwIF1fUD8gcU41ClUzQ09ITjR2K1dTOTNUNVczblBm
+Q29zL1NUSkU5b1RmQ1EKLS0tIGI4UFlxakRta2drNmYxK1BCOUFzZmdGMlNKTFdh
+Nk80cXA5NU85NWhrMUEKnWC+dGL2xPeu7dzg5xKdOoEC2Se8uSOZnvP7ioF5QKRK
+RLeI9lmOOt4zUR6mYWCCPQNIAg==
 -----END AGE ENCRYPTED FILE-----
--- a/secrets/kelder/acquisition/airvpn-privkey.age
+++ b/secrets/kelder/acquisition/airvpn-privkey.age
@@ -1,12 +1,12 @@
 -----BEGIN AGE ENCRYPTED FILE-----
-YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IDdXUTlQQSBaUm1C
-WGJDSUNtTUYxbHVnWU44VkRnY3F6cTR0Tm1EUEdDYmltWHBrL1dvCnMzSEFqZTdS
-K25tMkdkNEZ1dGhBMVhSUkR2M21EY0NtbnJjb0R5RVoyTDAKLT4gWDI1NTE5IHhv
-RlJOd3dCa3ZaeE5JS0ovV3ZiY0N5QThNSi9LaXQ5d1JIa1UyeVFJekUKd216RGw2
-Szg3VG1PWUVweE9udFpta0gxdWx1NEU5ZmNwK3hMdHdZNlB6SQotPiB3dlxKIXxG
-LWdyZWFzZSBCLGsgWCU+UWwKWXVYQTBqVkRMKzNsU3JuWmlQdVpzdWJWcVdwVUM5
-aHpmZFVPbWlidHJEYlN2M3NvUWNqVgotLS0gZHhwUlE3YXJSdHFkdFpkTnh0bC9a
-TytZcmtxd0pldUg2YUEzMFJ4QjR5dwqaUnjT3oaUunudOqNfh9twKyaRttf4sk9G
-uiiKoEa314HbI1vgS4iCNX4vG+468SECiF9llZL9U1w+1MSF1y1BKy7XrDCsp7Xs
-HiA2aA==
+YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IDdXUTlQQSBMZm8x
+RzAzWXRlQytFSUxRRTk0OEtVOVlnK2ZaU3Y4TER3TmtYcDdCcDBZCm9wbXRlaDZx
+UlVkRzcvVW5EQUFsMVdYamY2aHU5SUN3T0tQOXU1Q2grQjgKLT4gWDI1NTE5IFNW
+UUlmdFNBMTJWcllXS1lUWlZJZ2k4UE15V2NXeEtjaGlocjZPOXJheGcKbERWck1a
+L21ISnlCeU43YjdSSWp2ZEFyMGxBUnVjU1RSbzFPN21rQmpJZwotPiBrUT84LWdy
+ZWFzZSBTOCB0bU4/OApLNFRZVTVHTFdSMEYvNlIxMnhXLzJXZkF2V2pVS3ZLRGRM
+SHJUekJRakRtZUZTdndwazV3ZEw5TkdWVGc5Q0N6CjUxdnpmY1JTCi0tLSBPNklL
+WDE1cmR0ejZZTG9FUlUzWG4zS0V0ZlNTdU1QU2xHdFpNVHFlS3FNCs1z1hVkviH+
+1d1Wqu0s0Lt0xEWX2xk+xpJ4QAP9E8P6GdoMBT+bzGxfakRuwDWUtng6dd6SK41A
+aIIAjWxFfdgh4XcVuZ0vpGls/Hmf
 -----END AGE ENCRYPTED FILE-----
--- a/secrets/kelder/acquisition/airvpn-psk.age
+++ b/secrets/kelder/acquisition/airvpn-psk.age
@@ -1,13 +1,13 @@
 -----BEGIN AGE ENCRYPTED FILE-----
-YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IDdXUTlQQSBIdGI1
-UVl5bVN5TDUvMTRuVFdpdG9lSkRjL2hOTHo3OVFxQ25IMDRlRGdJCm1oOEM5Rzlv
-cUljejB0aUNCS0x5Qjh1Y1JWQTNmWE9kcjF1ZktJVUxLSUEKLT4gWDI1NTE5IHBN
-Vm4vbC9GcUdaYjNlWEg0UUVTVVVHWG5VTnVPRFBkUXk1dm8wWlF1QU0KZEU3dXFR
-YU5GalhSakF3OEduSlhuYTN3SVdFU0NrWmJBZThvN1BGU21TUQotPiBdLVQtZ3Jl
-YXNlIElWPzRFcicgYVoldUFzClA3M2JUNFU4T2xSRmpyeStMQjZNa1I0bmxLSUdj
-NGN6NkFvbmJEVWJXSEhCMjhkWjhyZkZPRyt5N2diZDI5SGwKczFsaEZXbDljVGQz
-cnpMcHpPdTBPL0hwb0t3dE1XNURWckVEOFZmQwotLS0gbmQrNm9QQkpxTnYzTTFt
-bHU3WWVDai9BY3VSaTB3NDN5bk1IdUNiMWk4NAqyrvPkq+FP+fSs9mZMgxLTJICD
-5l8Ii5h9fl2APzedygOLFGQLq0qW7pjBygfmQWgG4gqsO4iKIwEjUiv30/QCUhKL
-CGZJpN8AfZAcow==
+YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IDdXUTlQQSBnVWow
+SHJzNi83TGFQMDhqMnpBd0RrVldSSzZjMWh6VG01ajgyOWJzNTNJCmFTR3pUeWxH
+dHpWYzlqZENheFFHay91OTJVYWR5clRKU3ZiNm4ycXdwZW8KLT4gWDI1NTE5IGJx
+amx4c0tVQlcvdVJneU9hazQrZXFjbmt5T1d0US9jMzAzUkR5VlJEQ1EKR2UvRTBQ
+dlBqcldaVk05dmNhK3AwRk1iM1l3TnEwNVA2emtDVStibFBHZwotPiB5Xi1ncmVh
+c2UgRE4gMXstKDpnZH0gVSlMbSJcOkogUgpaZXcwdHdxVEpXSTgwZ2oxd0NaczNY
+eXlPOWxpNGxHMEdJclJnNGd0dWlwa29Bdk0rZG83OWxyRytlSGRGOXF2CmVLUWs2
+WFV6TVRaLzNGZGsvY3pJcmlqTm1vVUNwMEJVVExVNnNLWTV4K0RweC9rZi9HVUI0
+Rnl0NEx2N0htazkKb2cKLS0tIGtZbFdSTTRia1RjWm9pM3RGekRhWTJXVGpmWk9H
+azZ4UUhjbjZEZm5XVXcKiJfvO6GgQkA+EOJGrZtidms+p4plupP9w7P/Ukgh3Dl+
+y60gpsB3Ibpm0JlKSan2TO97g2VvmBZmP8o7NBHSM7w9SsU5E5igeKjJdLU=
 -----END AGE ENCRYPTED FILE-----
--- a/secrets/kelder/cloudflare-credentials.conf.age
+++ b/secrets/kelder/cloudflare-credentials.conf.age
@@ -1,15 +1,16 @@
 -----BEGIN AGE ENCRYPTED FILE-----
-YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IGdTeFAwUSBSdmly
-aEtUTHh3Uy95ZGhEcno5VktOcmlWYzVqUTE1MUs4NDg4WnZBT0Y4CjY2QndadEF2
-TzF6TlJxall2cW4zeGltQVNabUJkcWNCUDRwZXpjYXJubVUKLT4gWDI1NTE5IGVL
-N3dkVDFuSXdXZTFCVStzSCtCRUJGWUd0bnNGdnBhUlIzMExSNjBqWEEKOUdvZTlK
-dzhyYWUzTmFzbnVxRTZRNHZ1NGFXSkJ3ejM0S0JCTGNpcHVzcwotPiB1dS1ncmVh
-c2UgY0NxK2VxdyBdRE8vQSV1cSBcIFw/TG8jQwplZk1ZeTAzUnZJUm1qQ0VxUGpU
-NU1waVZ6OXF3NXQvS08vblYvRDl6TzF4RUhvdW16anZWcXdORTVnCi0tLSB6ayth
-aWRVUGgwazBMSUk0MEdETkhnbURkbEZXUGNCNnN4OUdPMXpkelcwCoil0uw2yDNc
-mOUMhVzALll4DgCX/MskwCdYohSBnMpSzqtltAhkW1aqdbuU3PC9LHQElpuHqpl9
-leNTu6n5nU5BHQ5qWShedL1G11SRzcblImwUcyg10d6Z0nUoCUjmw3BnGQ2wwvhC
-M+GGeb9X1ORRciqprtTq1WXWGG3tYgL9SjTAEtyMhAZ3CFjh3p4BdC9pVhCAJ9TA
-tbRAtqIz8VTzG86G4zPJYzBwtAse8tJDEO40GUqcOsmXhmPPpd7je1k381+GVrMj
-q2g2gTCUOrMryVRX/7+H2iRxtIxmhqESXIWgY5SIUv9uRA==
+YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IGdTeFAwUSBMOFFx
+WXlGdk1vVSt5TmpKakNjM2lsOWpwem1BcVNFdTFIYnBobDNxV1gwCjBWZ3J1ODhp
+NEZucWppYWw5TmRXREtVU0krQ2FGdmZadVNxZE5lNTV3MTAKLT4gWDI1NTE5IGRi
+bXhPNjlOZ0lVK09UR1VmUlIvaWxiVnlJMGVhU0c1YnRGNFdQNnA0a3MKQ3Zra2sv
+dGpMSFZDNWk5aGc3YWVNei9XV2tnMk1zTnhZdnd0UmRQSFpVawotPiBOayUtZ3Jl
+YXNlCnJLSmQ4dE9SakhJcUhGbys4UlBTdFJSNkkyVmdKZmJpbnRjdTduemFmVlV2
+UHh6c0poMUNSTGphRW1xZWpHbGYKRENFRDdUYUFFSnByQXhhc1I1Qy9VRzJVdzZK
+akRZOEFpUlB5VEhZVjVzYjJXekZNaGJiSmZCNThld3NBQVEKLS0tICt2RkJkaGQ4
+TXJ3N3oram5HQVZNSStGelowSTJHb2FrK2FMTW4wQWtPT2cKIMU6vOUPEWb94/pv
+lmGsbgnc12mgeygKea54H5u0vdOanxEAzd6OpKhlfhZCMjYYPcQAn8q4PJtsyX9Z
+3sO0lHC3FlmIs5LKsruNK7J8FoCh/cfsc3CbmHghogRDQ+Or3H7fLz0v1eJiOQJF
+DGL9Lv3+t51JmZZf46AaLIJLE5YBRy1wYmo+YIIcPJsxJTly5r7lSLvGrOHQDFfq
+IAAqSFzROE02zKWeAOhC1rtpa+tGhsS2l+nldWIO3lTOH1yjzWKXqwPjyDgtWEaJ
+mp86FQbuyiNdYMx1dhh82yfP8sLsFcz/r8WskxAl
 -----END AGE ENCRYPTED FILE-----
--- a/secrets/kelder/ddclient-cloudflare.key.age
+++ b/secrets/kelder/ddclient-cloudflare.key.age
@@ -1,12 +1,13 @@
 -----BEGIN AGE ENCRYPTED FILE-----
-YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IGV5cTNkZyB0blBa
-Nlo2VGUzZzdTNW9heXhuUTJWYi9lWkl5WEp2VXcycExWd3FsLzNzCnpoZVVHaUxK
-aHAxVmxQSkJ6a0JnSFpkdmRzLzl3ZktwYy9yckFSNGxzRWsKLT4gWDI1NTE5IFhl
-RlR5TjJoUVdScjRKN3hDQmg4aDJpSllnd25WNmlVVTU4SzZRZEdnQ28KVGsyVHN6
-TmZyV1hSbWZqWUtYNFdEQ0FLMjczRW5HSWVEaHJidHBjZzBZTQotPiA/by1ncmVh
-c2UKUlJ1V2Y1eW1aNG1CTkx5VjZlREt5VkJjOVZoUno1T3p4WldSUTFpNDBXb21m
-Z0l6eGZKaTBqbjRiTTRybnEyagpxQlRIZldEVGdNblRrZkMycFljdkwxSjl4VHcK
-LS0tIDV2Q0NHeGRUblhCc3JUenl2bGhueER0UnFkcUZNWXR1c09QWDI0R2FkdXcK
-8DfpILM67mlC23bKjt2hWfpI51JvTa2YBEvHwHDuaaZBw8FIU6E8s77iyjTysmsw
-vmQwTrdoUPhfLHXspjHH1GGObwOxvdw/Mg==
+YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IGV5cTNkZyA0aUpP
+M0xNSzFPRkozdVFYc2ZMZEgzUTdhTTBPZFl4Vk5ScXM2aWNoY0V3CkFmVG9CL2Mr
+ajNwSkt5dE5Gd1ZPZUtocllqYkk3Y3hBQ1VTUkNNdU1CNk0KLT4gWDI1NTE5IGJW
+S2ZSWTBzNXk3Y2tVZERqd0pkaGdhM2d0S3JQN0p3U0krTHM1RE03bGMKaDRXd0sw
+cnJlMFpnZmd0SGhYRkVtQlZQZWdwL290NDlXbUxjcU9NVDJCNAotPiA0K1Q8Tkc3
+LWdyZWFzZSA9QmM4XyBmWl9sU2wgdTkgU0pGYDUkCjE2WmR2OUxYTEF2OEhydnpO
+eXFPb1RoMG5va0lmQldiUy8ydDhEWTc5bFlDVUJuNm4zMktPbEtGeXlBWE9kR2EK
+aDVSNHJYVEVjSzBkcnV6M2pLRGoxYlI3YzU2enRxc2o3azZVQi9lcFZGQmwxTnln
+MGlQU3A2alFpZ1czQ0EKLS0tIHZKd1J2S1IrY3dkZi84U04zMGMzNkxEREtPVnQ2
+WHFpMEVPbENReGdSdTgK0A2R0MgSUrQ69tID2tBpPE0RJVLmo52tALktitTt58sy
+tiDr0+aVLkS7Zq90U+JuvHCFozfa0h1RqH/ZGlTtWZbheaJTxCyoVg==
 -----END AGE ENCRYPTED FILE-----
--- a/secrets/kelder/estuary-wg.key.age
+++ b/secrets/kelder/estuary-wg.key.age
@@ -1,12 +1,12 @@
 -----BEGIN AGE ENCRYPTED FILE-----
-YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IGV5cTNkZyAxUzdG
-dG9ZNkpPNGlreWxRMFlPQUdFTk9FZ0kvVjNhbUNvMWU4a2krcmcwCnl1Vk1PUS8r
-S0lveDV3OVphc3d6UDdLKzR4ZjB3RUloRzE2Zis3bjhsL00KLT4gWDI1NTE5IGVx
-TEMzdDRDbFBuT0c0V1Y1d1diSUVYMEw0dmJwcG9WaWQwcUdMMEVtZ3cKZ0x0OExq
-REFEdlJPU3o2WTlUQWU3b1NxcnJ1ajRRNkhxR1lxUmNpM1BLZwotPiBrMTREQ0lb
-LWdyZWFzZSB6TSp5Y0knClQ3V1VFY0dzSy9iNVdkRVZYU09yWjhONXkzck9VZVpC
-THh5amMvTlNLRDN2YUh1Mk1ncFcvZTZJZTRIRUlON1QKUzVDTDJJVk8KLS0tIENE
-N0ZzdjNnTER6ejRqZ0Y2WTd6dUJOaHJqTk1HT2U2TlkyUnBPTFc5WmsKYcIKEURp
-YcoFwU+gxq7BQlXo5LJDIcB73HPeerPnKYpfdyXFlsdm8mv3IXPEabSPwSNHXGIx
-BdinoqfHgAjMwptksMA3iIOWqp1cF6E=
+YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IGV5cTNkZyB1OEZC
+cElibS9nS0d1WHFtcEhSeUlsaVlzUGNHelBVaUFnaWlFbnhyb2o4CndScG53UkxV
+S1hiNzE0STZ5d1R2aG9kSnZoam5XVXBIVmNxaFJYRUx2Q3MKLT4gWDI1NTE5IHIy
+SXVzalEvRnlXL0dlTS8zbnl2bjhRWEpaV0xLUHFReHdvLzgzeGh5QUUKNFI1Z2hS
+S3d4RkR6WXF4SkVHUXVHa2FLQnBwUmJnQ2ZFc2Z6MTZTamcyawotPiA1MC1ncmVh
+c2UgVlgwPHxDIEEgbiBqP3tCCmlITHNiajMzcjRwNmZsbXp0ckFtZzRYYm4yUFBL
+SWhvNCtOamJ0UG5ETFVBb0pkdEoyQko4elpVQ2oycXFEdXMKCi0tLSBNUE1FWGNt
+L09qUTNZMEsyc2NWM0V6WXRCczMwbnJvSllRUFRoa09kaGswCvEaR2LTuopcssFG
+u5AzxVGagfznhgX8F5SSWHu/t/tkortU3Jn3++Cm6zf1uSeWNQfHhaNSY3dpbfC2
+6HXpQWTbpbhbQ3QsNonWPbL8
 -----END AGE ENCRYPTED FILE-----
--- a/secrets/kelder/htpasswd.age
+++ b/secrets/kelder/htpasswd.age
@@ -1,12 +1,14 @@
 -----BEGIN AGE ENCRYPTED FILE-----
-YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IGdTeFAwUSBvRWE1
-Z1ZpNTFjTnluOUlPMldCQ3BzQzdVaEw4dlZjc2xuMkhGWlNDU1ZZCjVGNk9PNjNS
-elNlSzMzYUNOQ0dzYkNFUDlxNlg4S3BGbXNldGN5eWYwZTgKLT4gWDI1NTE5IHp2
-eDFPZ0VadjFVZFdVMXlYd3ZFRXIyeDRQU1dMV3ZEWHJEaGxOSzgxRE0KVVpvVnFQ
-WHhpWjN2Mm9TV0EwajlyRTg4TVIvbm0zZGFBVkJqbkJTZEh5RQotPiB6QS1ncmVh
-c2UgdycgQmJMCnVhd01JSEpUQ1U1Q3o2Wnh5UQotLS0gSkZwd0tNTGs0NkFiY250
-eGR1WXRLTWhzWlZOaHlGaHQvNUh2MjNDUm8yWQpH1cWbszmSTjpqz8Wyrt6g2TNP
-rtCRSnfw7UcoMh2oW3kyYcQrwf/sAFAHLNMh8oOWoxrKG1vtPxpOz251hlnee8JV
-dIZ/2Gj/lPXDFTkhmX0TfABAe4wPJlM2wu9pj70UvGnI1osR6avrpYr9mMau3Ypm
-Ucix6cE=
+YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IGdTeFAwUSBvakpj
+SG9wRitBV2VyU2g2MUZ2S2VQcHNDWGNPK0ZDeVdYNlhhRE01UGpnCnEyYmZUaUtL
+VDQ1MTZ6Qnd0Q1loZlB5U0VYZ2cyTEhDb3NjYkdGRXhjWEUKLT4gWDI1NTE5IGg1
+NTl1SUh6dzF4SVNkWUZzVytwcEh0Y1RuUWNGOFVXcUJRSTNHMXZYSHMKdml2YlJL
+dTAwdXg1b1l6cko5N1RUR2lMWlMzNloyUXlIY25xT1ZBcW8rMAotPiBCclUtZ3Jl
+YXNlIDw3IHJyCjAzczU5V21hekFyWmhTQmpqOHh6WXlrT0FKaUF3QmZQakFURE1P
+c3BkMXdNYXcwWDdqY3JTSWxhdmx5QjhDTW0KbGl1SmdvYVBDOStFUHhCbWRxTFBm
+dnV2MmJQWUZHS3llSmluMjVlcTlqQVh4TXYvR1kwaHhmUQotLS0gTUFRcXc1R0xl
+OG9neFpSd3ZXcCszMXBqMDUwUkFZWFlWV1RiN3dTUGRBawr7l/HCt8B95tLf/0Ns
+GDo+72SlIoitk4WdG00n4fD92xBnAfWjQiridjb8RgGnJOEes24MwXyfx3fgrdor
+rlS6mvmsR0G95L2eih8vArvNmGQwfyG4q6Y7nCLoC+pKp5hs1Rjjeu6n31jaCi1O
+vJdc78tM3yYJlI8=
 -----END AGE ENCRYPTED FILE-----
--- a/secrets/kelder/nextcloud-root.txt.age
+++ b/secrets/kelder/nextcloud-root.txt.age
@@ -1,10 +1,11 @@
 -----BEGIN AGE ENCRYPTED FILE-----
-YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IGdTeFAwUSArMzRH
-YnRFQUNJd0dRZDBEMGJZeitaS3Zaa214c2FnakxMYVVxOW1xMkh3ClpSeEprOTBW
-dk1tRWhmUXRzeWpLUm13Z05pTnhsV0hCRk1YUjJQMTdDQ28KLT4gWDI1NTE5IGQ4
-OXBuVkRiS0lRQitweU1TRURzK1VhY0lnWFpZRGQ0aG9yOGhsa1JnUlEKUkU2VUhr
-MTc5N2tkdFYxd1RUemk3MFEvb3d4eHFaVU9ycEhBWHk3QVRwZwotPiBbXGVcI3J6
-LWdyZWFzZQptTGx5SmVNM0FPMHdGY0NQK3AwCi0tLSBwbUxtKzMxYTNpdUlPc3BZ
-V1N2cFlyTkZvYThES2wrZTdHTy82cXVoeStJCk0ed1c9gQUw93efGmqJDQ608cwj
-PDVTyJ7erVlArctJkTKOx57QMqWzMSEGh7O196SceZEv
+YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IGdTeFAwUSBxOTRH
+MzdSN1dkb3U3RXRycTkwK2h4QkZhV2hxbWRJa251N3graDB3MG5jClJTbnZMT3V3
+MEJkMnlrdjUyU2JNQnlVZDlRYnZ4eUtLMUxKcGMzRmcvaWsKLT4gWDI1NTE5IEJh
+S0pta3lQZVFzS2pVY1pCT2I4dDRueXZOMXBtTC9Lekh0aHFxQlVnMnMKanhCSy9J
+a3Npd21NNitYV3hoUDl1Q2dEbXQreUJLL1hDYVhMdkVWM05NcwotPiBbZFssNS1n
+cmVhc2UgMmZTIXptUmsgcWonIFd0REsxMDsKODU3ZHlJNG9Xd253MWNNMDJ6aVFP
+QQotLS0geFUrZ1JrdkFtZkN3Y1VKdXlxazNxUEVRWHU1eGRXenBPR0oyM1Blenl6
+UQoW2AOnkCnicaW4o9+2c+Md2lFEhByMurC1IWcdwVm5joN3TUMkmQbPBKcznnZ+
+uZtaioDalQ==
 -----END AGE ENCRYPTED FILE-----
--- a/secrets/l2mesh/as211024.key.age
+++ b/secrets/l2mesh/as211024.key.age
@@ -1,18 +1,18 @@
 -----BEGIN AGE ENCRYPTED FILE-----
-YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IERMTWVGZyBUUmlu
-VkJMYVltVTZyUnh0aXdZZzduSEl0ZFAxb2lIb2F2ck4zdlBjdFZNCm51RnV0M0pi
-VkVaZVdOMWpKOW43ZjhFODgzZTJ2c1F1eXc5WnJvMHVZUGMKLT4gc3NoLWVkMjU1
-MTkgbjhDcFV3IDdhNjB5U1h3ellMRDRRQWVkQ3hNcVQxUnQrbkQ0V2doR3pFWFRI
-RE9xMDQKTUh2bXV0eTdvRmhmTVVaRllRcEpiRStnSnpMeGFpeGt0eEhvQlZETXhi
-awotPiBzc2gtZWQyNTUxOSBaTnFJb2cgUW03aXgrM3FWbURXR3o0ZkZsUE83YVk1
-ZzkwZm1JdC81aHI4YVJOdWQzTQpzS1dHRFZYeHV2djVFN1Q3MHdhWVl5WVc5NExy
-M2xEckFMTjFvTWI1Y3BrCi0+IHNzaC1lZDI1NTE5IHMrcVJmZyAwQ0Z0a1FHU0lV
-VEFmMFpsNXF3Z0l3eTkrdzRZQ3lSQUg4MFhPaUNEbGdVCnFuVEhXWDdndnhxdUtV
-TkdRZnpFTGpaZDNJalI3b1NHUld2NEV0TlphK2MKLT4gWDI1NTE5IExObHUwOEFT
-bGl4S2F0YVdHaGFnRjdIQ3VDeVFDbjh5SFpkczN3d0ZuQUUKSEFvdTIwSUhvd0dz
-dDdBSUxDOHZaNkNLL0x0aDRCS1ZORUsrdWpJS3EwVQotPiApcDQxLWdyZWFzZSA5
-ZSA9YD4gbWMgRH18eXd0YnkKbmcKLS0tIElQa3pEcVhtN0N1bW4rSTZ5VnB3N256
-bnM0OXpSc1BuNmJwZnBremRIZnMKhN29J3s+Cif3jvx63Xay77CdC6uVhjsojdbF
-zhWad9vPolrrbEiNkhcdrutyTRniFBUEwxQVGmAxcEySNTr3lnWnWQFagphu3F27
-zLs=
+YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IERMTWVGZyBOa3lC
+UDJxSmZud3VVT2pPSDJ1WUNLd3NPb2lZVzRRTERVRGZuaTVEbVdFCnZWTURTejNE
+Lzg0SDl0MEhDWmtabHBIVXN0MFNRTzZyWndBeXpCTlVkRUUKLT4gc3NoLWVkMjU1
+MTkgbjhDcFV3IGxCQkI4SkJiTlo4cWJZdDV4REdTaElIa0pzcU9nNWppeERDTG9v
+VFNVQk0KRU1QaXVZNTlueWdIemlnak1WTHU3bHpsK2hlR1dBOTFUYVJ6dWVGRDhK
+cwotPiBzc2gtZWQyNTUxOSBaTnFJb2cgS0JMenRWUDA3MlQ4TWdzekdDTVNtUUxk
+bXhXQUhvZEk3SDBWanJ6dGJUawpuMUl1MWdnakpCUHhMUUxwcXRrU2oraUUrZmJz
+bnplNGZRR3AxUDBOUCtVCi0+IHNzaC1lZDI1NTE5IHMrcVJmZyB1VTRwUTg5bmp3
+dzdtd3BEQllDZndkU1NBV201ZUZDRXN5WEZ4M1dPY1dzCklxZjZFY2xMWUlvR1Vt
+V2ZJZ3FsVStXcnN0ZzVRblJMMlhpakxJeFJRRW8KLT4gWDI1NTE5IERFMFZSZ1FR
+NHlpOU1aN3VENmoybWhNZUlVNW83VTZ3ZjFMTjZGZW1iSEUKZlhGM2hZT3N6c0dz
+UzQwOUw2aWNTK09HTFZGUXRSblpDdHRISGI0Szc1cwotPiB9TnZPNE48fi1ncmVh
+c2UKM0Zlamlyc0FYZUdKUHF5MGI0YlBJeDRWRHU5L0hrL09oR1J5dzA0S3VhK1Zo
+Qi90Z1ZSd0RtTW02eDNWVGRVCi0tLSBibm53dnRyOW9VeVdHa29HVUxXeFBEY2t6
+VlBBQlU0UUZ4bGR0SmdMTEFrCn2/4PMGrFJnz9ppR4iDkxE1Zlj5zE57ZdnyLHqQ
+RUlT9J7XhTk0x24A2iBLpy4oOxTgQ3ZV7jBkW2qduU+yILBoYn+HeQ6EB/SnNu+B
 -----END AGE ENCRYPTED FILE-----
--- a/secrets/librespeed.toml.age
+++ b/secrets/librespeed.toml.age
@@ -1,13 +1,10 @@
 -----BEGIN AGE ENCRYPTED FILE-----
-YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IFZGY3c1ZyA4N0Qw
-bFd4Q01yb3M3M05Ua1BPZjNsK2cwYlBuSUM3TXRaa2hPU2wxb1hzCnhoTzNMYVNT
-bjRUTzFJdjdZVG1IVWJNa29PNjVVQ2NWbFdnNWNjcDk1bk0KLT4gWDI1NTE5IGVu
-d2x5N21ZaW5MeHBzWkw5QnV0SUNiZTJBVlhXOFZacUFJVktNQXI4MTgKYmxQYmlC
-YXJvYjhKbWVZWGRPWWh0eTlIZTJPSFZTZmt4UHJ1M2thNHRCMAotPiBvPls2N3ct
-Z3JlYXNlIGowLGEgUFNKKWljTX4gInUKMkFwNGRiZUJCbUZhN2Z3YnZnZ3Nna0tD
-UCtrODlldWZ0Rk5INmxTd0tmTGx1NS8rQUtTdVFwSVROcjVqeUJaWAplNWd3SUR5
-MjRzeXlyemtka2EwdVZDTkowTk5NMk1rdUxCdkR5ZUJOCi0tLSA4bWVKMXFTalg4
-ODFIN0hsTS9lekdWZVI2VTNKYlE3UzhXNk5nM1ZCMlowCn3ZLml2b8qDs+A2W8Nn
-YGCfDV+aes39ef/2wu6EMISradXZQrzhSj8JHn7HqsarqSQmOhYP5juawEFxAuZJ
-kUc=
+YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IFZGY3c1ZyBOMSs3
+ck15aUZrUHpNYUpZeFpITUxMNEdURzhCQ1o3Nm1LN1FsRnVVd253CnhUREtiRDFV
+aFZrODg1dnFTbzE5dW91amg3dldIS1gzTGQ2QjV2Tk1RK00KLT4gWDI1NTE5IGFp
+SjZjUFdtRGZoSjRYdFI0T2ZRUXZOeDhiT2pkZEFUUVhMQzJTREozbVEKcHRmbG5C
+S0Q4b0tEM1k0RWs3Z2dyNGxlOTM0NWNsRU11OExYRUQ5ME53NAotPiBcQ08tZ3Jl
+YXNlIEU3ClFIemdCK0E0YlR6YTg0TQotLS0gYmJFUlIvekNqR3NzcUpQbEU0K1VN
+SXo5QUcrLzY5WGE0MVBlSW5rZFNlbwqEaxbkhovIIyruZTIrmlh4n/CcMZkHKHzY
+cgEeL255GfGLafFJQm24mw8GjFzdmOeHZOXbdxUNaNcsFMQyT8M5
 -----END AGE ENCRYPTED FILE-----
--- a/secrets/middleman/cloudflare-credentials.conf.age
+++ b/secrets/middleman/cloudflare-credentials.conf.age
@@ -1,19 +1,17 @@
 -----BEGIN AGE ENCRYPTED FILE-----
-YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IGpJOFJBZyA2NGhR
-aGJ3RjRaTjlFeUtWa1FZbmdQcGJmbVdxNVkveURqbmdwL2x1RGpVCnY5eTFZRjV3
-QVNMZ2xGMHVBek1BaklxUUtiRU5pTU9kWFk1VHhGNE81SFUKLT4gc3NoLWVkMjU1
-MTkgVkZjdzVnIElYUmkwbUFPeEExZnJGVWwvUFZsRTdhYkJsSC9CM3hMbGtuSVFs
-UGJXQkUKQnc4MGNMM0JZcC9FeG5HeHpLUVFlNE9xelo4Qk1mam5WNlBITnF3WnJs
-WQotPiBYMjU1MTkgVkpmUVdBY1p2UDdLcFpXVnJOZGUyZ1VXNVYrUmxkZlpqazRn
-cVlLYkt5YwpZSUtIN0RwSEdOSUFYQ0Zsc1NzeUhiQ2Q0T296dmZ3UW5hY1Y1MEJn
-MzF3Ci0+ICV5Qy1ncmVhc2UgXSggRWprMCBuCkdKVldUMHozVXlqTVNrUVdyUVd0
-MFdSN0dPSVdnT3hMN2NNYVBRSGZnV2k2cVp4NGdjMHBHS0xadC96YmNObEIKUWVH
-YWk1Q2tuQUpsV01JWVozbG4rd0ZiN1JHOHRFYVFIenVxOFhXRndrN09lODkvaVhB
-eDBoVmxvbU1FbWJrCi0tLSBSeU5TaVZUbmdwdmh1TDVzb0s1eDFvNkVrK1dqTmZG
-cDJobU1DZkdHRWhnCvEtMAlEC+BPPYX1YvvcmvRjeOgbuuxzjkGjuB+tT1pBKfYR
-9gsHtkPWibhCk546Q1w+fY4StxKmaoxPddBjeQNXh9W6cCQ/vSmxAFya3w5SEtPd
-QjozqEVsiwBmBrZgt0UJ96e5hmhmD6zU7fp/RhpFpZv1JrEkhYEz8+jk5Ai96mSg
-0pKDAU8xtCnyBBaPiaj2jU/6kiKoGaVXCEuIv0uayRhRp0wap/kf+ToHA/oXVXbl
-TZsalOEKH38udhBJiMjRgemqyHQEEpjmYIMWdiTvH6PGZ0yp/09iiEyBCMwzcJAk
-nr8HyZKcuzswBcVjRak/raM9lAbpdWWktHxAZa67wsCH017FDrN9e15B2MI8
+YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IGpJOFJBZyBYcHZp
+UEFRTGlNMDdmQlRzUWdIVFdJQ3dDZEtFV0E0NDhDRGJ5NklPcVZVCjlCTjBUZ25m
+TG1CaDdHNDloWTVuN0ZiS2NVdWs4aFUwSUVuT3pTekc5QmsKLT4gc3NoLWVkMjU1
+MTkgVkZjdzVnIHh6ZlAzL043SUFDRmVZclkyQmJtQkJDaVU5dVhKbTZmclN4R2dC
+VWJ3aW8Kdk01QjIvSXNPRjF5WEJyNTdUSW9kRDBPTU1iSzFycTNFR1lPS0NYTTNh
+YwotPiBYMjU1MTkgWGRZNTc5MENwYjUwRCswTFQ3WFpFMjZPQ1U3b0RJei91T3hn
+aGtyVEFuRQp0ZWcwL1V6NDYxQlJzS2xaWW1XYldoeTc5NWJ2T3lYMmZBQnQ4SER1
+QmQ0Ci0+IGImX2BbRnItZ3JlYXNlICNlKEU5IHBacl96IHFTMkN1Cld3Ci0tLSBM
+cE1vTnFlS3llMVFlNDdVVFNySjhPTkFKRHZZVXhuNENTYXlaeHlrdHJjCjcjVVjx
+E//dWUqrirg1f5yZ66Lo+XIPxPkPRJ/D1EfcoeLKS7Fy/CsySIgKgMzc3imS/lOu
+7jlUL8gI/AB/w+ChaZ3ial60yEC6aMM6qKguad10qAGNLIQr5+G1E4daN0pXF47H
+D4tylxvjw/Cg3iyIRHfjbYS8fNrnGibYChZCgkIKNAwVJ7yQK2dqifo+59pAMIkX
+9QdAJbGuBrDbzbY6DSvagwncXPmYz10Z4GJKqlp9E/cx6dUShoOOB0VuGH9ZIiBw
+vcFI6NBIhuhi6fKxNnLwnmp8H/hbAqlfgutPr/XjV1a881b8msIrMNcokQmqurGF
+/kRugCfQV9kouNqwO5V/hzbmTaQVsePesLoN
 -----END AGE ENCRYPTED FILE-----
--- a/secrets/middleman/htpasswd.age
+++ b/secrets/middleman/htpasswd.age
@@ -1,13 +1,14 @@
 -----BEGIN AGE ENCRYPTED FILE-----
-YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IFZGY3c1ZyAzb1cy
-bHBVd3ZEQTI2R0tyaStqei9KWnZkNklSYnc2NWlwa3NNM3hXNEVrCnV6anpBUEVG
-RU16RksrWWpkS2Jwd242dVQrbWFjaHUyQjl4NU5EVFZRc2MKLT4gWDI1NTE5IGdS
-ejBneU92c1BXVVZyS1BBd3BYd3lHMXNWTW95UCt3MzNEQnQvc0RFMmsKRTE2bVFH
-TUpWUzNoWmx5SnJhMkw0NVRwNFAzYUEvdm03UmJvdm1iNlB5dwotPiBRaWBxXS1n
-cmVhc2UgUiogYk1BYG9RIDtQIC9yO1A2Ugp5SkVsSHdFeXlUOVJqWWludTBOa2lo
-WnFwVFlzTTczMDd6QTV3bjh4WXFGczdFa2VPREVQYk5Id3gwQy9TODVVCjcvbwot
-LS0gckpMRnk1ZzNqK0dwTUpTM08rNzJXTy9pYSt4Yms4bDJKRTJNdEZiempaOAqM
-fEEZwzb9VpBOCyxctqnyXmhVnOKB38DoE0yvUup9nVgu2ncwXVrPh3tMmbCq7GpX
-MqpicRitNIlGhP02YyXpb/LMUU1nV4V7kN5dCIzM3mve03Y0SZG1zw+eAkDDgs75
-Lr7rI/blUgbbo19v1swXKZzxykIQ
+YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IFZGY3c1ZyB4YnJm
+TlRYSE16ajlLMkwwM1hScXk0TGhuTi9kcDJwcGZERGxQNkhqa0VJCjdGZHRBLzlO
+VklWNFh3bUlPeWU2dEE1SFRrQm5laVl2VWZwL3liaVpycUkKLT4gWDI1NTE5IGIw
+K2VNWW9qL1JRQ2IrWDFNV2xiMit3eUtSTkQ3YXRYOVhYd0JjUHpySDAKYmptejE5
+WlpUTnpjOEtlb1JTUlF2SEVuUm91VEtSd1h6U0o3LzRSUVdybwotPiBiO2lOPVcr
+VC1ncmVhc2UgV3l8Ky46TiB0PGg+Yj9jICRJJXo1IDB3e3dEUygKN1o5SGJMb2c4
+T21oM0N6ZkNEK2RlT05RRng4dHFTSytNNk5rdWQxL0xDeEg1Q25qZU9TK0VveWps
+OEdXNWd1ZwpJU0lENjhvamljTWlnZEg5YlpqdzQ4eEg2UlRnUi9JbVI2WVZUQ01m
+blQ4Ci0tLSBkWjVIbjNWb0RtM1FrYTRQQ0ttTlRHVW5Xc05Ja00vb0lmRVdMTmxU
+RWxnCnXVvmFpJwQmhntKUtwm1BiU8BIRx+PUi92iyEwegu4SRiNsQiNj47Qa9onM
+A7h17wZnO0U+LVZdflo8jeUETk5o1U7jOGRZ7ghMvfoj+kJGwI0HVnEvJSY2BNeI
+sMXyL2130IfyjVIteaH0o8M0bZFdfDf9GrU=
 -----END AGE ENCRYPTED FILE-----
--- a/secrets/middleman/mailcow-ssh.key.age
+++ b/secrets/middleman/mailcow-ssh.key.age
@@ -1,64 +1,64 @@
 -----BEGIN AGE ENCRYPTED FILE-----
-YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IFZGY3c1ZyBzeE55
-R05zRTBpMFIvRlpseVdjMjI0UVJ2WDBxRmlJdUlVejdXdU4xQVMwCkR2d0RsYk5D
-cStTUVN0K3IzY1RYZE43S2d0WktZV0JCNFR2ZWVydUpMZm8KLT4gWDI1NTE5IGpy
-U2c2T1lFbC9iRnlEdXhidVgrVmZzcmxpRmdkTTNScmY5eDZMZE1LV28KZE5WQVNX
-d01pYlNsc01Ja0wyY1VNeTBDZWREN0FQb21kd3VTT1Rjc1NtOAotPiByPTQmJi1n
-cmVhc2UKSWxoSHUzT09uWXRqNG9BdwotLS0gTTJ2NVFjQ0Q1NkZmb0dTZE1Xc1F3
-K1o4SWMwaVB1WDFkZTBMWUNxQnBPNArt2aY0Lb0ey64r80mWia4oYkczRtqs6XJy
-34qL66Fx5OCxbq0q5klZz3S3CPMV4cqglODpsAOf4vq/3uZIbbVXOe1T4jwZ4TAN
-9Wx8nA6LOGNO+NB7RakJUDDjZ0u+PsVH1ohEUGrpu26+oHFRRigyB4r7Cr4LZ/Pb
-6T8S4vDCCl8gMgxKkapCC74eghSyulx9d1uEFmlbdureAuig0iUUFCktSECtPOT3
-7bw/dHi2KiSVoT1ujWW0cJUThqyuS2ugrbXqU2Op9FjM0mkoccRkwbjbMMZz2DVY
-i9KYOIFW3MC6kARgNfIjiggkJlZT15JorbGB88ScPpePrybRv4AX4hLlygK5mHEv
-9VlnSqW0XARkS/JUdcnxfJUSIgh4xN6papiO9ArKRvqTcUkcRagQfWwDkwWR2lBi
-7oAfPNkB0UjczlZqWPbnDhLNzh6xDHjVBYg2ZBwaqpyFRSjzn9Yaj2S18EzvuWU6
-RqjLrLZQv13UPG1dyBvKSWf+wSnVJ5dLsjVl7H1SFYhOU0hrdELORPq/Kw05jpTw
-EKOB+rC4wyKUGJo3MYlKiUFhTUSMlyhY6RX4hfivLYeU7NCV50UDy/JAQHssQcfX
-LLAAg7bYbYCmRay0gGD19lO6OpWXWCI9JvdkFw6UU0btc+aaT4l24+pb3uHLun2a
-V+O3RFLgKmhdtCx3e2dV5x8XjzIqKHWw0mio4dFOyEhgeUXxsoulOivOFXDEBfkq
-Ds/kBl7B7mDvtKUmaVgmi3XGhT1TMucXii7JL8w9MBWgdrBbl0rewpvafp34W0n3
-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
-L2QMeVI=
+YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IFZGY3c1ZyBLd3ZF
+ZXlWVzBCaWFsZXZ6QzNIK1g4R0tDT1d1bFBraUtBbWJOY0d1RXdVCnhLbFpWL1hm
+Vm9jQkFUcDM5ZERlMnlFQWY3VXdIaURjNnJZVHEzZmNXaGcKLT4gWDI1NTE5IHZN
+ZHN3bUViZXgwd3J3M1RoeFNoYnNVYmJzV1JGZm1jMUtsQWlFMDdUWFEKN3N5b25s
+TkhxWDZNSjlFckVQR2gwWXJldHRROUdrYnFGbHBTYXc5T1N5WQotPiA7MUp4KXZC
+LWdyZWFzZSB2IEggZQp5ZThjZXo0QzAwUGYKLS0tIFBXM1FRcWNNSzFwRFd6S0Zl
+eW1vZG9lL05iMm9GSFh2K2ErdlU0YmZHMzgKytqCxkD/Dyf8cq7TPXaPFyqzI7KO
+mpkuSdYU8IYQUvS/+u+ji0Sbn2T6BAtbOFhqUw/WSScSryHlHvOkmyd4GRFcuNrR
+Frsgt3sTN1SMDiqnisyw7Dh9Z3xeckA8irwkuPfmPpWTlBINKc5mp2JNJ6XO5Vxq
+L+XSdieyUV8qr2ll4o5UMuRv5bk5Wrsq+mtYFXNHh39nY90qB1pMI0QWn01MFyha
+A1eaBZ9SUrKLOp+UuqFvbv6CtlEJotXu4YiP+Q9xn12iVf+NxPNtsAuqdxqRCCQf
+hw6HzW48J9T9or4R1kQHGbBaZib2KPodczhY+KotB3CQ8tRb8QqyKq5C8+Zv6drJ
+f7X8UrMLq3w0fdZlM3c8KeT1Oda0Q4PivfEnLaCcgKpDBkEuAWjJ0IUmDUel1R7J
+Nte7vJafvTdebTNXquIa2OHlbZMidP96TFLAsOVfzAGnd5z6u3sCUB+eKhhLX4BU
+MkniK9gheXOYjiXV9Dk8SFaC80SmUv52JlpU/qV/H1dr2cY+KmsUYIrmrv6ZeYCP
+Sa3fQqVcs6fAJKAZuB3oD4pEBMx5tbXYMP1TH7zZZyNI6uMZdXpyy3G7elx4L6/0
+1sskvmlr6ECe+IgiYbRqy3MrLKSJRivH8gzpiCBs6tNKqVq5j49x0zLODcgyL2k4
+wG6cisZEuKd/8QET6wnSnfBgvf1pMfHYryLWGqFAjawskUgL5+cZBkRRFuxA4k3D
+3Kpl+L/aSsz3zPz45H+/8Uqi//vrvzxO/OvusbFrRPo/tLvz7c50IMFODklOneVo
+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
+kYQpBkisN35U
 -----END AGE ENCRYPTED FILE-----
--- a/secrets/middleman/nginx-sso.yaml.age
+++ b/secrets/middleman/nginx-sso.yaml.age
@@ -1,22 +1,20 @@
 -----BEGIN AGE ENCRYPTED FILE-----
-YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IFZGY3c1ZyB0Zk5z
-dzVqSGJxNlVnTi9KN3dvelh0cFpTdXR1UldsQWkrTmVrOW9SaERJClI2djdMQTQr
-U2hMeGxZOWpWVG5SWUtnVXNZazlXK0F4bUtkRW5hZVk2bncKLT4gWDI1NTE5IG10
-aWhlaXNFMy9ONllrYVRwazF5MmFNOGJJOWVxRnNqQnNocmVTTExKVlEKWW44d1BU
-ZHJXTkJJTEdSdFU4dzlJc3NaNlI4WlVEVVhFUWV4UWI3Rzd1bwotPiA4SS0jZi1n
-cmVhc2UgVD0gRXIleGAqUXogYgpTbVdueWxHN0NNQ3Jqa2hsSWUwYXpTVmRwQVFW
-UTgwd3Q3eWY1ZFZDRWxjditRdEdUNFVZV2UwTGpQZUZFYjhNCkZuZnA4WUNVeWht
-SWtHam00NWNjSHhBM3RTTmdjaFRTKytzRFpJTm02TXF5Q1BGdWkxN3lMRmk4Ylk3
-ci9BCi0tLSAvcVExWEh5Tkx6TDNJRkJuZUVmS1UrK1ZtQ3hSVnV5OGtmRVp2WU8v
-NkY4CpSGlODuKDBde83bkqU20xgamzp5o1px5VcyDFhm/q6/QkGTrqPZFqp4Ho96
-Om8Jk3RkOBTSbdYlRXlNOjq7SB9t83bf4nwKU/RH9bKBOXlOtuU6vgDdtZnct+L4
-S6P93brPGYhV41IkjNxg+HemIToZxZwO4lUqlICmkJDQhuk6F9SWYfiNQd8l+lXa
-e4WbldWMpwlOtJVplen2F8itZWAIGPNRq5UTmzKA40Zk6eW+YWqB2mhvbZ7b4Nto
-gruh/4URaWqjOGLGjCfw8zJIU3qf5wWntd5BnLkFYjFZMYLWQHnF/SCKxxLVlzsE
-9t4vu2lCwjGKj7uEoPUcF9bTSNZjynNFLZsshGjwi5L3dvnUJzUc+JXKxMqBaVYF
-DrBDBtUnjae9jj+/YPLoO+6BnbezJLhvfIyT0Fw82CGa9Utlt/VltWp7gUep6YyK
-ArhZam2c45rzlwV1tnsxjZFK9EuRYJeN1VRYr+tR2wShUGKP1CEz1CFmkTa+r91V
-/8eUvOAgEtP41y2vxmpFu4kjNQEAiRs9Chbg+Ap0zUSxDZqkaQXSXE4PWEgks6VL
-I8ss2HfQDtcnEoNOwuESawI+i2oDclvkmGD+UDYz/BmxkDrjWjL0CxKQHDv3GHgx
-URR5TtwKc/YoiSkJTYpBYB1VLhgHCnsQ175p3w==
+YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IFZGY3c1ZyBnS2g0
+QTFhSlhtQVdVK2JPSXloSnc1MmpTbkptUm95TlJ3UklnaUZKaG5jCjY1dWp5YXdv
+ZXB1MWlNRzVhUEYzK09IM1c3eEZCdVIrK1pNL3lJQTZwSEEKLT4gWDI1NTE5IFZJ
+TS9FeDhrN0xBMi9xNHB5Z1JOSnFjN2NGTk9TUDg4SURXbWZkdUpnUmsKek9KLzMz
+VWd0NUhTaEF1UGU2QnI4TXNobnNYMWxzVkdzYVl6TjI4QmhXWQotPiA0P1BqRzlx
+dC1ncmVhc2UgL0pHID0nX0RCNwpHUkV2aXVHU092NlJqMlRuVnFmVGE2ektNTGFM
+QlpZYUxnTVFNU2ZmcmlBLwotLS0gYWtGNCtrUG9SSFlSZXBRcjJPa21BT2xUWFNU
+WHlzdVZRTWFUcy9RZXM3Zwpd2dsYCFPinKYFd2S8LYFr0BXU1vxDzO07iBP81Oo6
+Szhvxg2o56J1wisab9mNRfC/U2n/IBVA19Bb+E2OvRGQOw8wG9Gi77ybYo+yWRbD
+ptzeTuVHPppKGMm5tZFK/6t5rJ/57DgRQ6UWcy6+o6jBRtpSDBlfYLFRoTODLjKt
+hPRdCGl2v60E2TUSoSMBp2Ex9OOeIl7Y4NOVVDczGbMW8fR3lij1ttkxQA0ZMFJV
+wK3TANcHRl69MlB6eYC/EpTT54Fu1TNSVvLY3d0fceB3H/gdFspHlOqF44Z9P0O3
+wdIdNr45+gAhzGU9WbD1MR7MeSKhn+epxpbyV5MUGr9bE2XzVIvVfe9JCL+LlHfY
+4jOb9kySIqTFAL34tgRnA0I0zioBTd1eMqmdoItHM2APJqYX3UVg6zwmkY7SmqKa
+wNmKW7fZUkruc8zn3WvGotkziNXjj1njyMoUn9/oAAKT2AMXqXh2fh9tB7E6kf6k
+KVUkWIsqqYXUfSTqQLW+QDE1i8RxoNfNfH3LF0nataga6NWt21XAslSfiDY83e33
+jwd+6je0sxP3i7RCM8CARE3t3swHYYOuBy7Ycr+4k2RZrULq7/xq4/d8bV79koNx
+exCFExZn81Su/DvfEYx5jlBAJDtm5YWzzs5c1Nxb7X5g99PW3tbSTt4=
 -----END AGE ENCRYPTED FILE-----
--- a/secrets/object/atticd.env.age
+++ b/secrets/object/atticd.env.age
@@ -1,16 +1,16 @@
 -----BEGIN AGE ENCRYPTED FILE-----
-YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IGhrYnR2ZyBKM1VC
-TGJOMU4xVkVnMjlTRlpmY1BKT3h6WTJEcEJFWnZyYThqczZPUms4CitRUStIdlhY
-MHdEV0gwZ2hBbE9pM3VkSTVOL2ZBZFBKekFqMmErTzZ4VTQKLT4gWDI1NTE5IHBt
-czNzeldEVnh0L1RDa241U0dWcGs4emJ6ZjNyZzV0R29nQnpkdmhUMlUKa2RCUzlJ
-VXNRZnEzV3BwQWFJc28vWk9obHMyem8yWmhDZzlvUmduSWJRdwotPiB1clEtZ3Jl
-YXNlICh8NkYgPC57OiAwdixSfDEjIEl0MWoKcnRQNWVKSTJqM1U0YytFYThuVm1B
-S01MOFQweG5zcmhBbkQ1elJOOFJ3SXdoNXNBaTB3VW1YUjJxdkxGZU5PMgoydwot
-LS0gMTFBNmtWUXRKWFVWNi9aaGZVZVkzUzVUeGg1ZkplUW13b0l5UE12c3VvUQpV
-KCGAO6MlgPP0wVcDfMnJWEMSpqIs3X9wkkIoo5yw6NAeUhlxe2emWwk663PPUkXt
-NfiLA2jUTu8B7I2BNQKi8PMmnrydfjV5sGH8ACeP9QDWPHb6Hlri2R7IK8juEpl6
-0sDrh5ktb2+vNqoz9lNm1hk0S1l+InjctP7HUM8hhNjXVASBUhUX37NJEtH1DQdB
-7AlebX6bd1VDGwsfCyEzdg4N2nd/73J4fcjvtqoEz7fdfkGisNjjJ42iFNitLNZw
-WnhcUByV7msJq9QuYI2dozDn8qJPFyva6sfmeuZTgqclBOMsDTsBzWlXgK11k1Pz
-got2TcUCfPIVqWQ=
+YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IGhrYnR2ZyBhL2lH
+OE85cTlBa3d0ZytWZmM0cXl4WXltOTJIM3lMSGRqbW9iVElaS2xJClhkWE13N1lp
+UDQwN0hnaElBV2VLTGpucHhVRUZwZ0RVOU5MK0x0TnlxRnMKLT4gWDI1NTE5IFhi
+RVFZcllIckZyUU1pTEVYRExITXN3ZDhUT3o5N3BmelBtdXNxV2dvVEUKWDJtOXdC
+NWVTb0pyMFcxWmRMbmdqMmwxNXhIY2JSZENsQmZpR1lkcklESQotPiBcciktZ3Jl
+YXNlCjUraTlZOWVXZzU4VjdxcU9zencvQmRTbUZ5R1ZHVUNXU3kvOXlvSFdDTW1Q
+ZTlpbHFnclhKbFlUbmdNaG1IaUIKMXBJWnQ5Q3YxaUhIZGlZCi0tLSBvM2Y3Q2F1
+UWVybmpuQnUvQ2tUOGxKTVBqNStZQ3NpM0ZQN0hWOFNBTWhBCi2kQTV1OJjjClfq
+abbX6n2hlRf/eWJTpXdsYA0QhQabcQQexMZkRzDYOvazX3TWlpHMyxBPgWKnKvqy
+VR8Tcfrm0LlhKDW7W+XfJe2G8/v6GdZvCkolFmVBvUC34DfPAq0406VlOLMlMtuu
+L7IQQXeVb+5Oj5FIf2V9gGRygpc2VQ3UdyZJOjGQRAkGWHTcqm77s6MeRTOK9Hec
+5Q5AZdQ7gFh8OBOaYeRpsR2vwgxPWeT9HZqlt1vB3sj1AjrMNbsg0W9qAHNZzGMh
+si/6whXhG2YKhyMoolkQKDe2x1mixc0iiYAspP5ocpgUJY99PlDu7Leyqv7g1DOU
+BQ==
 -----END AGE ENCRYPTED FILE-----
--- a/secrets/object/hedgedoc.env.age
+++ b/secrets/object/hedgedoc.env.age
@@ -1,14 +1,14 @@
 -----BEGIN AGE ENCRYPTED FILE-----
-YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IGhrYnR2ZyA3MjM3
-dytZeGQ1VmFtdmtEdFlQWG9zMzZLY3psY1NBaVloeUh2VG4xbVVrCjdua1BHajdT
-WEpvdTRoTVdTUGpqTzhQWXpEMkxEVzBwQkwwZ21qNkdMVkEKLT4gWDI1NTE5IG9x
-d0ViazRzcG1qSDNFR29GcFJtMWxabWRqdnBjQUZBWklyNUZvdjBmMlkKcWhDUGxu
-YTZUbEhtMW5pajdpQXYrdEp4NllXRkQ0NWRhc2p5Y1Vub2VjTQotPiBMSTgtZ3Jl
-YXNlIHQ3Ngo3enhCRVhiV3N0TlkzdHNMMHJTZ3F5ckc0UUlUa3hCVEZQdTUxaW9p
-R2hJRmlxWTZPU2VVbEpvZDZpKzN2NXh0CndxRVM4ZkEKLS0tIHMyTEZJUVRGWlB0
-bS9hbjduWWJuVW5KVXpnYlRkMFdCK052RkUvSEdMV1kK4fjaE0yBZXu55Kn1j/yG
-PRwEhA9QyNbas21qCikGh8RxCUfoobhlKHpYxyvOMenhv0+8gb3ceXzSUR/3a98Y
-orARTVFlOvVZolCwoyC86kUExIBubJxO3EpH2UxrvQoCOrAf5XdD+qzt/G71wpYk
-jGUknUWUyPbj9HWoVo2aRmC//bCnena9DUVicAXbDwqr5/KCHHFlkT9UI5Vqvgfw
-rPpyZ+De
+YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IGhrYnR2ZyBVdWNw
+S2wwWC91eGozUTFxQ1dmUDFYZVFQUnZjQW5yR2hJUnMxN3UwbkVzCkg2aUw0ZXVC
+QUs5dWduRjlna04ycGNuSkRFRE42bEl3RG9qY1Z2TC9QeG8KLT4gWDI1NTE5IFBn
+bk8yb1h5R0VNT3QvMFp1SnJxUUtlMW9zSXdKeXpJVjFLTGh1WjlYaVkKTkJTb0dO
+UThtdGYwNWpJN2tVbXByK01LaDRwcWFRY3ovZlZzd0o3UEw1ZwotPiA0LWdyZWFz
+ZSBwKU9CQzI0eiBaOScKYms4cS82QjdKS0pjeG1iK0RyeTlrZ1dTZ29mVkZFaFJK
+aU96MnYxRW91YW5aUG9UR3pvVGkvSHlaL0o5eHl2dAo4NGxCSXcKLS0tIFlBSSto
+eFU3VVp6aUsrWXpIbUtpMjFCcmFwZ2QwaWhKK3IvNjhIUnpzdXMKjS7LiWtTmxH0
+qVCcD2EjTj2Mz1qOdQ1nkSjW6Wp4H2Bxy/5InFRtUgx5vogJ8RvTJt1bqGBfq05n
+BzkZDnZ8pVuHnP2QgVfA2ShX138gDMMZPti3BXpg72H/TVCabe3rSz/gT0pZl8JY
+16a437j1uXXntn8M/Inb5Bik+1UAtnD4DPA/FGd9oOA7lSodtsD0+/ikZrmdEEFk
+xIPoT6DX/7v9py9c
 -----END AGE ENCRYPTED FILE-----
--- a/secrets/object/minio-client-config.json.age
+++ b/secrets/object/minio-client-config.json.age
@@ -1,15 +1,16 @@
 -----BEGIN AGE ENCRYPTED FILE-----
-YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IGhrYnR2ZyBjdm8z
-TzNmSFBzTEdVT2Y0cW81azFsM1MycWF4MlBCNWNEamNXeklVVEZvClAwbUd3dmVH
-dWsxZWh3eG9ianA4M1JET1RDSkpHU2NLcGgwRlJ6eURsQm8KLT4gWDI1NTE5IEQr
-em40K0ZFejlrMW1yQ2p5UUcraWd4RmpseVZsbjFwTndRYmMyUzhyemMKZ3U4c3NH
-bk1CV2hZNjRNaXJHQy9PN25Fc2cxekpNNnlyTktOcHh4eFlFSQotPiBLeTdiXHct
-Z3JlYXNlCmdRCi0tLSBraGk5eTQ0K2k0bTVBdFdsY3JqZW0vL1N5V2FFSjNsbmdE
-Nmw1OGwrWW1JCvuxFmnBfZEpLHNyN3Uyygvf7MfsG8PJg7Rr2tA3a+SrBrRijJi9
-XVsDzB3HWYGHTRegf9pz8KruyedFNu0volXDSjT0uC7Mofj50nF30+d/2Z25Vem3
-2KEpvrQ4o0C89il4L6ptRndmbn3uEe6+eFPBGLeDeuUaXUcuz811145ZNz7kalJL
-TJfeG2gOV53lu0NxK3wQ7bW+xtrwOHToIssGN0TlVVi8qapSXLYwxTkglYCD8jwE
-6fVpGA81JQy6EcKtVZ13xfFwF5pzrqeZQWSrW9b8Mk5SkIKC3MxTTWdlI9Gobqx5
-RsiphGvQ4ra+GraZNXDn80w5phXXv9jNX0VUGe7hi1/G+KYl1m1OOsdyD/QluG8P
-dqwfbXTo0F4zqWagP9dGhMkjA+lC0jmmFhZDQrS1RabVMCsK
+YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IGhrYnR2ZyA3WDRL
+WitTTUZVTDc5Uk9iWFRMMUZKZmlyTUl6U0ZqTTRzYkFpQ2F1UFV3Ci9ra09OaWpG
+aHJOdU01cFFrRUU2VW9vR01WT1NYc0ZBMXJkQUFvcjNWLzgKLT4gWDI1NTE5IFRH
+dWFiMjh6a1JBSjZVMnhPcmxVRzdLWHM0WmJTZ0NWVjREeStleHhua3MKamNGc2sr
+dXlYY1BxVktDMGppUjl2cWJHb2huZW5BWmZUT2E5MWVHOUxvWQotPiBZTyFtRUkt
+Z3JlYXNlIHwgWTMtJS4gIk0qbn10NSBYOzYKZnczZVE2YwotLS0gck5HTWRHa05J
+SzdLMW9tUzBORWhxdTdKVzFKTzVDdlMrOWpXQ2UrNGFXSQqoXXDRM+Hcw8A1PMDa
+8P/nRLQQlqgvs/2WpVyH2tP3cZeXGOCAU73L0pbiggcSnjxwhRLjX3ioSZUf7x3W
+3eH30STS503Xk7xLtxcMQWHS2KZw5s4FNGd62N3Bf9VJd+AU7OR+brsUUdQi1Zmx
+Rd4fu8IfptzlrxNy4Gk6ryBS/b0JYPraf2i4rM8VVzp3cgyZROuTVb6Tzgtu+2lh
+kz6HE10QDZCO8aRs6RhWjP1WEnx2ZDadnZ5Pu+a28Pb6mGHVx/Yppp41ApBQd9Z8
+/x+fFtIGIIgVRNCKo5zMUxM9CgDf+ZJxsKI2StdZ29FvQf9Dc9ZbUN5NiYofG7eb
+729/hxPiT/wMI/44wCg2VFezGjeF6fjqLMNxHqEnA+ioXRLtvl1WchBCctxkfEln
+1rowhD3+er4OG7rXZw==
 -----END AGE ENCRYPTED FILE-----
--- a/secrets/object/minio.env.age
+++ b/secrets/object/minio.env.age
@@ -1,12 +1,12 @@
 -----BEGIN AGE ENCRYPTED FILE-----
-YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IGhrYnR2ZyBrU1FR
-VUZoVjNFUmxNSFZIYzY3TDRpZ2drbklvemZBKzQveFRGUnJDUmlJCkFpZ3F5VkVB
-ZWhKTDB5UGJkTVZrNHp3YnBxYzdwa3NDN3dTSXg3YVl1dGcKLT4gWDI1NTE5IEwv
-KzhUWXh2ZFE1YTZUMzdKRnZKMU5tVEppV0tvem1lQkFxb25TZExYbEEKWWVsdHFD
-dXFSRWNIa0UwdzZlc1lzejRSdmp2N2lHSitDSWhCeVpwWFdncwotPiAiSzhzZi1n
-cmVhc2UgQi5TMyg1aSBUdCApZXYoclcyZCAnW14KLzNjbXJNOHdOcEJMZE8ydW41
-ZDdpWmRSCi0tLSB3b25sbnhBMDZrZXduNCtqd0RoOWZSdXF6L1pSbEF1K0ZVZ2tB
-TE15WFUwClKgHieoFUU9aDCR5P3RtjWMYDHqJ3BGHawqgJFySxUw6ZaiBKe5eFjD
-4/gtY9hIVVYvGgaULCLaM6pSE1wm85EsvqMXMU9S7TbxL7gplOugbtnYSggCF9Qz
-pl2FTQ==
+YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IGhrYnR2ZyBDNi9H
+cExLUC9SMXVLTVA0QXk1MnNGMlY5NDE3UzNQeEFSRFNtYktwN21zClpERkh2RWtn
+OTFRVzJDSXhzcE5sUE5NL0s3aWpKZHBTSm5Zd3JCMlN1elkKLT4gWDI1NTE5IDI5
+TVMvK0lPRDNDd0xyQUJUR0NlL0hkV0hNckVYbUFWU2Q2OVBRNTRqQUkKL3hiV1pJ
+UDZTUHBEaXVCQnpEZFNjZFFLR0FGcCtDdW5rL2h4VXlBSDFkUQotPiBTel8tZ3Jl
+YXNlIFw0Ul16dW0gJXFhbjgwCkJPWmNXNmh4MTZQKzN2ZlIxd2hvdEU0UkNndG5i
+dmluUUV2ZFhWRm9kdjFYK2QrdEw2dUtaOEVVSFV4ZDdRCi0tLSB4bzFYWU9CcSt4
+SmFGR1pnQXNxWFFKbHNIL1ovZzNKVmM0alRjV1ZVZWJvCt9gfTM3c2xivcVAjm1o
+pXd2nUEdaZtada2YOctboX6YSVID0YdRLFPdpdpwh78sgbdN9YBbT5T2TqB8zK5z
+ds4x5t2gChBNPJrdhez1lgVSqtCic9U/1GGfNCLCyA==
 -----END AGE ENCRYPTED FILE-----
--- a/secrets/object/sharry.conf.age
+++ b/secrets/object/sharry.conf.age
@@ -1,18 +1,17 @@
 -----BEGIN AGE ENCRYPTED FILE-----
-YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IGhrYnR2ZyBQcmhx
-UW5zUXljNzdPTHNLZmZrbnNEQlZqY2pWODJsSDlROStwamRLeFQwClM5UVdmVFpa
-dGd6WkwyNkJicVplUFRHbGtVaE81clFRV0tQSzMyUlFvQjgKLT4gWDI1NTE5IEVE
-eTJDNFpnMTJJc2pXZUU4UXp5SXhaYm9SV0Fuc1BFR0lVYStGeTFORUUKR2x5SkJR
-VUxSVTA5VGliTlhseHhjcTEzVVp0aDMvRmIrVitTSFdaYWpEMAotPiBRTmgieS1n
-cmVhc2UgKFFzbEo1SSBiLmt9Zm8KWDd4MkV1M1pKaG0rdzFMTDU0NDJ1cWVMOHdu
-NkhwMkNwaG8zZkJ2R283bk02b3ZsSTd4N2FGdTJabHFYMjFRYgp4S2lOU0l0L0Nn
-bklhSHFEdkRxcTdDTUlrcGJxSGVZCi0tLSBFaTJNTCtCUTYyTEtUdWJkamVBZXRL
-Z1ZyRk5TemJPNThkeStBRDd4SDMwCqHkFPwwIwQyNRKz+qiaTlEg+wae9/zBVEso
-lvsNmDQmShacPxNMX8gRJdDeZwPgVVj6vbzuvsZsaeqS0tz8Mky1t0lGtMlVWkBn
-bKzlrpMMmc4myREz3a8GgSK7Q3fEM9iy0lnKXsOrjXmO2J6Ebc+Uzp85Mn8cWT5q
-BHN18Vt4BjJXs+0XUwPxVEy6vnw7yXVeKEpFLtzjRXRVKpp3VwimDvgfE6XewR3y
-qv7B36u7xU4iTZam1N0ZwbdunVKWeqRfMv0auWpkGgU/gLjM0E+5qFZ6ENEBN9iP
-8wHddrpap1fYNYgrMGM37x96+J4NYomcUlcZ4M79vLUJHyXLWrhRhIfh6HZPjYra
-i5q8jB8oSE6UpAxkCkbcdmdmaRgMm3aNMZTfLcRCqOt33ScintJWeMZaybUGWzzg
-gnVSbp5C3On33EKOqPgR677CkB+TW4ME2/myGGW5/1w=
+YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IGhrYnR2ZyBFd0lC
+cjJ4YkNESWlGWFdQdUVOcldwSnAvLzc5WEdWaXVZWVk5Wk90TEMwCmNaeVdJSXpF
+L3NxSThKYVNYVGxxNFRlVW8vU3pJTzhCK3NuUmdZamhrcVEKLT4gWDI1NTE5IFpr
+L1pCbnBmUFVZa2NKQWpSb0hETTVlZ3RMYm9mdytDZDhFZCtTNUZEVmcKOWtaZjBE
+dUdYU3BGaHVKcG43UlU2U0MzSzJBSGU2M2Y5dFI4TDRBdzMzRQotPiArKC1ncmVh
+c2UKdnJzUlJJTVZIbGJGb1JRdkRhdVNvcGJlTXVxdFJ5ZThRMEp6Ym1PMWFZc3Z6
+UQotLS0gUkJjazd1dVpkdHZuUWcrL0J0bWVkOGJhWmhUcDlobW8wckhIdGFZaEFN
+cwr5CBcVGcQVqsDeJcXxbsVm07pVKmsmwLPw7zk7aRX7wEX0UhOGlJ/974pfN6Tv
+d6ezV53hrwdlegmBfw7UquSuMK926/iBHwLWHxCtMYmsg/tkTQQ85Qa/+vgSinUp
+XBEaKzeLwvQ3oHfIv8ch3Ar+J0NYgjiJhqelyp6cMWTRmAwoUQ4RjH4p3bvsLU9T
+fi0ax9EAPklrGq2/rBgPMvt71HjM2Is0NQ3W3us5dYBrJuIyWrZ10jVuKEkpEKux
+lr88i6k+XlI6zivgsfB60zZ+wQBeQ3EVgYiYM/Y2pZpNk0zi1DjOFkUVLVxkgLfr
+iHuKl9L3BelUwgLQrE414/xFOW4fHx75N3kxrvpF9MDRdtguiQDW5lNKQajt+ASU
+zsH4Zf5A09es/B3Z7GLr8lTXX4+ndJM99Ozj0Zawo5hFkHuiUnEh4KetbCjf8lZt
+nF7yGrqzLPvHwe2o
 -----END AGE ENCRYPTED FILE-----
--- a/secrets/object/wastebin.env.age
+++ b/secrets/object/wastebin.env.age
@@ -1,12 +1,13 @@
 -----BEGIN AGE ENCRYPTED FILE-----
-YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IGhrYnR2ZyBmbDlE
-Ylh6RVBabVdnMnoxRnR5U0RZS09iMUk3TEl5Ry9vbGNFQ1F4V2tNCjRyWTZUOVhp
-L2NBUzJ0OXlsU2F1VGMvK2Z2d2k4N2VaSExOTDVjKzdPODQKLT4gWDI1NTE5IEkr
-ckZzSi9DaWRDYXgyUVNBejErdHhnME5aeWc2QjA4RFQrZjIvM2JhZ2sKZWRkUE9U
-a3g5M1lMY3FCbVRzbFRBVzVKRmM3TFQ4RGYyK0M4K0lETFhuYwotPiA/TTJyQi1n
-cmVhc2UgdTNFPyMgQGVffGEKQmViTERtRXpSSStDVlY0YXV6dwotLS0gYkdDVzFP
-NnhmbnFaWVpKTDMza09qQzd3MnB5NkZGQi8vZ2Mxd29sM2Z4UQr6g8tdM6ChbRgt
-g+2KGxwrUaicgMiVNbXJjbRRYq/3Ml/ZUSwiyu/+jUOlrpCxpasrADwifILD3M/c
-sWW4dzVVR80t7k9FSDwy+EF/XvCxCRbLrqEbKNttfpig+9PRpB8R+so7YyYMhbc0
-84nzB7gvJUlnKDVS
+YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IGhrYnR2ZyBYaENF
+U3ZWVTZSeHVsOTNVUGg0cHl5M1RlQlhQcTJnNHlPOFNYNzJYN2hBClZXUlQyTG5s
+UFVBa2g0aDVlT1g5Y1Jvdkp4OE42OXdNMGFzUGpVNWZ6dWMKLT4gWDI1NTE5IFpI
+UGtaUktNOUFSTE10UytiV2JZcitmWjlHVjRJVFREaW5JZlFEZE1mVkkKR082bUph
+OXhMWTdaREQwaTlwQXNlbnd1OWxqdWZkUC9WN0FxNUJmM2t4cwotPiBnJFZhNFY5
+VC1ncmVhc2UgWCBaTSo3O0pDCm9hMHA4b1V6R1lCV1Z2TlFNT25SRkc4aTE1TEpK
+MGl6dkxIQzNEVTdLMkw4bHdxdHBNb1lMckVHM0xJdGt0bWQKNllIYWhCc3dWVW1k
+SkNoZzdYZVV3R2J3V1FqaGp6NFduNzdZCi0tLSBoSTNUU2xzSW1ybFpaWFZDMDQx
+aFpRdFhNZnNmclFDSEJMdkErdEhYWXdZCoatFl0+Sf7GxwRUQezwdykakD8jSjK4
+I6O0cClGNIyuFsu8UZkxPvShOlmNb/7SV1DBSwALT9sIXxvWLybUhis1gZCTX6CJ
+jSzGLXshIK6zAagWbpH0/7Mg8YcCC9Ii8ukw0oBVeMTH0nTkmJGzRnbh/iJQGvI=
 -----END AGE ENCRYPTED FILE-----
--- a/secrets/pdns-file-records.key.age
+++ b/secrets/pdns-file-records.key.age
@@ -1,20 +1,19 @@
 -----BEGIN AGE ENCRYPTED FILE-----
-YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IFZGY3c1ZyBEZXdm
-NEtBZ0x5OEFURXBhMlZtck1qYUc1bEd4dHpsQzdKdzBpejh3dFJVClIxdWtwbnhp
-Mk5hT1lhdEtuTjd6b2p0dlU4SmhIK283L21YZWJEVHNjdnMKLT4gWDI1NTE5IEk5
-MGZuelB4SUhpMU5DTStNN293STQzeHhMdys2N1FNS1dnREMxenBkUnMKalpPQWVr
-NHRDcnQydVk4ZHNXQTZpaENmTHVMWEZ1Um9DakJoUUx1TGRSUQotPiBjcS1ncmVh
-c2UgckEgdyZSbzkrXiBjOUtnfiB8UVUiCml0K3hnMlcxS1B5dFpRYjczVzE1ZWtz
-NkUrYUVTcFJiekZ0aEFodWk4NXFNUnZJRjEzRFd4djhUZXFPUitwWTYKV1RMbHFn
-Ci0tLSBlUzUvSTYvK2V5TFVnYjZGNWtmenFXOFNVNE9MOHBZcGZyamdIUmxtWFZr
-CmswM8RLtrvvhmuy/efwx+ARv9Fmam6XTe0khQ2NoPa5K2EGI/ZJVoQr0h9p48u8
-Qsi/1tALMjYh52SGaQd8m6pj2q0M+bnpld2xtrP3vPA20lrJbH1K1LadbZEt9Urj
-oX8oP486qBkRk9mxNv/+ngwFT2hcbeobQUUu70+iwTChPpFtfP4THPRFQA1Nth7p
-A+HWsLlWyWk8QaW2QIa80Gq1BBstDMNjiIvgTMTWZeEO0GEAlE+07sXOwz/fnpTd
-7llNvmaZACQXP74aNA5xZXzirq65e1alFCC25tPedggMuCFKWoTwlAla8UvThqlD
-VI60ARkRJ2GfKJ2RVblS380RotNiWTG1GiOdzJ3OngYceAvdEcCcYdfjoCTJoQTj
-IXW6NLI6GR2n/daInVrh9cwEAd0kNsOvjpZTkEgEeZzmLvZi1Z1H2a8ZyJq6A4L7
-jxqynZa3TKzcS3bhQG3iLJHEnQhhxUyf+S2d+3EZi03uWEvwGWX4aOKEpCEIUCVY
-mj0o3p5JPDaNIQPf3Bz0ByHYOu4LpRcCkYqphHVutG5K0P7Lw/Vs29oE7pSgm9uZ
-tj1CHRDoKXuRSk5koQ==
+YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IFZGY3c1ZyBiV0hS
+STZnejhRdGNONkVIVS9GbGRRSGZDQUhjQUI5ZG5vRjhMT0ljaEFVCmJjN1RNTGIy
+aXBaTzhMTC8yVi9YZE5JMzJ1Mm9STDFyY1I3OWp1Tk1rMDAKLT4gWDI1NTE5IEts
+SmE5NllIS3N5Yld1WXd1MDYvOEJqM3l5SFJBRGRtVnozNzRldWkwaEkKcFZoSDll
+TWRhd3RXMk1sby9Lb3gzTTlUU1pkanJIMWdieGZPQVM4em83MAotPiAtTE5USVBz
+ay1ncmVhc2UgK2VSXTZdblMgYiFHWDorTyBELgpzcVpxd051RkpCa09NVGppUWpv
+UENNWmRBaDJja2oyNHhvb1lMY1p6TlFJCi0tLSBhNkVtdllQNEFyMG05ZS91dUdU
+SEJYM2FoNDB1dVp3WlgweFBIKzdNRTdvClAt+yFxpBvGUNhwwoelFCjeZYQ6qO8r
+2eBvNHKwtQKTBauklTH7bkyMNyXnM/4HA7c8PhfqkH1xRz72zhIJPPr668X/yOVn
+HuaYhQRmyJ0evWD4Y39+L9VFpIwZQft5zW52YJjF0CltmR2E/nqvejh5yChVLZQS
+x9lJirm7BuK9XAgDNTdOVxhGpXUvtzs8TQxUyd+gWcm4mWqRHBUnGf3W1LT/lJS+
+SacRujYDM+yUIMa26+mpZZWaNZwzF6zFh5Vik+GKjcXuUIVuAn81Du0AtnMSNqzN
+C+2bd+LJVsV97L2NjD5xtY4YTlHOYDgrrHUtG+njAoUThMJk7NnuIPbZmkGHzsuo
+e/s88KwFTAJGXQBGtbzqZU8itv4UOPNkqOJhkoyNfIt29soGSMozYunbtg+9dwvy
+9owjUDVBgSQpXUWv1KqxXFv/ftnjBABUgZOoibhqJprq92wEumjYUPx7wbZR9V1H
+7QpRwwyzhrgfdn2BUTnCzXMfRwluOQ3WpHGOwcg0nvxSdwl0vmnqv/h5CcX36Hca
+bkxQFbId42Uel+yH2NILka2L9WPDHfEBF+8bA4gzEoWmLu+OjA==
 -----END AGE ENCRYPTED FILE-----
--- a/secrets/tailscale-auth.key.age
+++ b/secrets/tailscale-auth.key.age
@@ -1,15 +1,15 @@
 -----BEGIN AGE ENCRYPTED FILE-----
-YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IERMTWVGZyBySGJi
-WVFhRmdaRDNMVlhmcm1URW5FSzNmNVZleStBL1lOcWVNcVJoQ2s0Cmx2U08wVmRx
-YysxREo3eG1tWTlYL1BrVWk2WTByZnREWHNlVHluMHVac0EKLT4gc3NoLWVkMjU1
-MTkgT0VxTXNnIGlENXpQVVhNSm9lWVoxUVhjaE40OXRSSlA3TVlRYjVESHVVWGVS
-bVZkQkUKK3ZyRmVPNmRXTW1pbDVwTlFXRGxWcFhNMWNqbDZFREw4VkFzYStMd1J1
-cwotPiBYMjU1MTkgcU4xSnVKbmNPbFZORlRWdnEvdnhvZnhPanE0SmtSYTZFUFQ4
-ejVOYWMySQppYUhCNHFuam9UVUllMFZSWHh6Q1ZmbFNhZ1dMckNJWEl2alBkZGdl
-ZzhRCi0+IG80N0p0Mi1ncmVhc2UKTXZnK3NOdnc2Mk85VFU4NTFCVXhlQ0RuMURi
-UE9tdk1TTWE0WlJDaktrVnlxVWJtRm9Ha1JYclRuc1VRZ2VhbAp2OUl0a09mYUFL
-MUtPYnJZUEJ0OU96ODVEQ1JGOWNvRzBsMkh2QWFYQS9rdTEyNjlXRDE4RldvCi0t
-LSBrQ2k0UDdjc3V1ZkVwOXdOa1p1dGU1WVN5amIvWnpKam5uYlUwR3RZVjRJCpS8
-TNqU8U4bRRS7bISPugIUpx+VSGNg+sIj6sbiQJk84mpQwfcfLYTiPjq0KizhtBco
-DiyHW7BsPntLiRem/PRMquzMy1sl1QelbeZaF1EAYA==
+YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IERMTWVGZyBobEUz
+bkRnQzE3QllSbFZINUpuZzFOdUJmUzFlZEdmeUMxcEhQQXFUNHlFCm11SWNyRkR3
+dVIvMWplckpnZ250SG4xLzE5YUJ2Q1BFMUNZVlFiU2NwUGMKLT4gc3NoLWVkMjU1
+MTkgT0VxTXNnIHN0VXFuTk91Zzk4dThUMHRnSjdzZCtFQU93TVI4dk1jQXZSTzJM
+amZEd2MKT1dkalYyVmZaNkVZS3ltWEtLR3lES1NicThXTUQwZzVOdFAvMlFyYjk3
+OAotPiBYMjU1MTkgUlZoYnc1Qml0KzdxZ3kvK1pXL052RlZtamRxK1gweUpxRFJK
+NnAzWmtnRQpDTjN5UW12VGZTdFNjSkx5WC82SkJiT1lVamp5QjdyWGF2eHhsM1hw
+VFpzCi0+IEA4ZzFQJS8tZ3JlYXNlIDcgPFgKN3A0aSt6b3ZsOE8vc3MzQmZNTlFl
+ODUxSm9pNU1sOEdRTWp2OE1wSTg5SytBRStLcmU1V2NvVEVOYlB6VWxsZQpReGl0
+Vml1ZTZkMXhjQThiUTEzWldhY0tjZ2V6UzU1em8weWJ3ODRTalNZNW5MNWVuMVUK
+LS0tIG9IQXcrZDRRMnBWeTBJMFo2RkFVNmFheElackNsMnNqTEFLTjZUK1VNVjAK
+4oY6S1ZV6pu+2/vZ1yf7/gDTf8+lKP2udzkRefFXZk+reCMN1RPS92RGXIwUSYSZ
+qKc3Tjku45mKmRkD2CP5Z2CpodVQmJPnC4+LK3UQUnF7
 -----END AGE ENCRYPTED FILE-----
--- a/secrets/toot/otp-secret.txt.age
+++ b/secrets/toot/otp-secret.txt.age
@@ -1,13 +1,15 @@
 -----BEGIN AGE ENCRYPTED FILE-----
-YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IDYySmNjQSArcDVp
-TnB1QStoMWJzUWhMWnVtb1JSYTFublZKL25nL3JvU3B5M09TcXdBCmVHRk13R2cy
-UmlXU0V5VlFCUUFHZ0ZiMUxFV294MW9tOTRKS0xNUDFGN28KLT4gWDI1NTE5IE9i
-SUtBVElCa2tWdGlKZzJLWnBmeEw2UG8xSGdWYXNLdk1IejFNNG9YZ1UKSVRJNnhw
-WEV4dkFUYVpuMmFaWFFYc0dLM3BMWlpSN3RzR0hYaVE2OU8rQQotPiB4LWdyZWFz
-ZSB+XyB2ZFU1SQpUVVZpVWRLVVZqTmNTU2d1S2Z1L2x3NHY3UTZCbHZVRHZlZXhq
-d2RFN3lURmlYU2ZTQzJ0bEdtRUNvNll1V2llCgotLS0gbXNpSWpPaEZIQTBybUtR
-eW5MT0RBdW9xZDFCbmVoajRjM2JhcEpmY2tUUQo8LhWOKi2MNQsYiRtYoIsmvPaQ
-DWH3JkE2kZvy8Y5vSxSEWDuXY8Wj0sOj35wu5Ox5Ti6+XwG1VlEBYwKYwqU6homd
-h2TWE5f1kb0M4aQEA9+PZat3XJqnLKsG+NmLGQAbn8+LqyXYfEdqm8VF3jc0lZmJ
-kdLsXZEsHy4PzAQgQmxBD73dUOOaggQfeSKSbLODku+Tn0YODojv22/DqfN79A==
+YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IDYySmNjQSBteVQv
+NlVzRTNUQnczbnd0REpsbnErcC8zM3JTcit4NkhQNjQ0QjQ0NGlFClp6L2JrajRr
+dXVac1hReVpXWmFaK1VnRE1JN1lvcWVTeUYrcW1ucERjQ1kKLT4gWDI1NTE5IFUz
+U29nTFpXTmtuMXRSSlhvZnJ6Y09DVncvMyt2ZVcwek9kOHFiaVVEbDQKbGVJeHhT
+VkFWR2pQZHNMam8vNUxScXI3dEJiNlgwNjhwbjBOQldlYlVLcwotPiBkMlpVKjJm
+cC1ncmVhc2UgXChaRCwgYCJwPSEKcFNOQVVtVi8xY3hWK0NKMjJMM2RVU1g3Z0d5
+SElRVVNueFV1ckVMbWR2bndMVVhud0JQbDlDdy9OQTliaGpXVwp6UzBFWlpMVDBk
+WUtxdUZCanRHUm5yWWdYUnR3bWYxc0F6Q0IyN3RUZXA3aUVOd1JKTlMxCi0tLSA5
+TlF3R0wwYWNqU3lYZnM2eUtBUWVONFVVSC9NU0pUUTNFNzYzQllyRmxnCvsKPdHG
+YC6NLfWs0pqtQe71g7UibjkCw17qR0wy55MFNVGxZbXLww87tDrHgIday9NxmsgE
+QOZFvz5G5+iehqFp/8GSmRPHmPaH0YaIOV2vA65p8l9izjRTyEpcw0kCWbEmOSD3
+3Rt1M5ducrt5NjMNeJTpvrbWInTMeo+4Kbc3jJyLWwNw12lEcRmZpFdkN7b+i/3B
+/uFkUOdxvs6R+VE4
 -----END AGE ENCRYPTED FILE-----
--- a/secrets/toot/postgres-password.txt.age
+++ b/secrets/toot/postgres-password.txt.age
@@ -1,12 +1,12 @@
 -----BEGIN AGE ENCRYPTED FILE-----
-YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IDYySmNjQSB3K0x6
-bUlBUzhZUzVRSDUxZFVKSkYrcmNuRzVjSEpBNkZkRTVCWTVuREIwClpEbm8xVDlV
-ZnZ1UHJxMWwrUlFSanBiTGlSaU9FTEdBdnA4ZmxrNUVYWGcKLT4gWDI1NTE5ICs3
-Q3VadkhJZW5EUGJkQmdwYU1waUQzRzh3VGpMOUVKbDM4cG0xNHQwVEUKdVhKeWZx
-SVQvdjdKeCtjOXlDWjBaOGdvOTQ3TXViMk5GeGZJU0tBK0tIcwotPiB4aVYtZ3Jl
-YXNlIDogLyMgZ1MKVHFNeUZqNDlVTEtIendDanhZUktqYzljNUhsL1lqVGZyanJX
-Y1FYTTA0TWxZdGxhRkRaY2FsYjU3Zk05dFArNQplbG9hUEM1V1ozY3dkc3E4dzc4
-ME5mS3lncjZaSFQ1RTFSSkdmUU5VVjlwc1NUTGMxK2k2U0xBcE8rUQotLS0gd1Fq
-cDQvYUxiWEtsaytYTXBSR1F6R3hVVUtCSk1YNHJiV3dOeDA4VEc0RQrBQ1JzW3sx
-okv/DsRX7tlhkWrH0gvPmMvdd5KUL4QgPEA4g3V8uxnZktALIPa9X6nx
+YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IDYySmNjQSBDTEN5
+cjBVMzhlZjgzL1loNWl5MDhLNzB2YkI4TDU1WjI1UXdLVHNVd2pNCnpUL21takhw
+K3ZGWjBrTVlRM2psL3l6QjN2dHpNN1NxSEpvbStpVkFVVnMKLT4gWDI1NTE5IG1z
+MnlrZjRPSU5jRmt2UTVQbVJPaW1YRWMrelJBQnRNWFBwTDhxSFhaRUUKcnR4YlJO
+cE81blpjVndDMEJSbUU1NkJMQU8vcjFCVVZmRkZNd0Rib1NtYwotPiB8aT86J1pl
+LWdyZWFzZSAxZCVALi5OIG4iQT1+WiA6PGUoIEY7bC8KWGNCRzhqZkRnL2xYdnZu
+UVBsRzBhZmNLT0JEVHViSzlrNmZiUmlPejZ1NXpBR3BRekNEdVBNeWg5YnE4blAx
+MgpGZ2MKLS0tIHcxek9LK2pTa2hnOEVrK3JiRjVUdlZLU2Y3YjNSWE14bU4yMzVR
+cEEwaG8KxCg3I6+QOkegEmidN7rk3TwMGAkKO+d46ZQ1dqVGU5wiXFC7vfcM++8E
+sQ6cwYtW8w==
 -----END AGE ENCRYPTED FILE-----
--- a/secrets/toot/s3-secret-key.txt.age
+++ b/secrets/toot/s3-secret-key.txt.age
@@ -1,11 +1,11 @@
 -----BEGIN AGE ENCRYPTED FILE-----
-YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IDYySmNjQSB2bDdl
-TWJESHM1SkVsSnJoUjA5SjgxQm9jc0RRcXh1dGNoa1hWTWc2TmlVCjAxVzFKOGc1
-YzU3dDRrTnV6eEFFdGpLelE2WWU3bFJVcHpXVWg5REd5LzAKLT4gWDI1NTE5IHRQ
-eGhMdkNpNjYya1pDTHdHTTdjaURodjh5Wm05bFpFcXN0bUxtN0FranMKYi9kYURX
-NjJveUFQTVdtUGcvaFRiWkw3WmNtZmZvSUlYUUNvSnBCdEtaVQotPiBOXmItZ3Jl
-YXNlCmN2OUZFWUh5c09kMU0zNUt4eDU5QmdvTTM2R2tzci9FQTlJK3ZhNEt0TzVH
-UWx2cUFMekJsaUJIaHVxNEt2SQotLS0ga0FOSGhKL2loRE9HYytMRXVyV0ZnWVpu
-WlY2cExRN3dPenIxWVBEckZKdwpEExBab65A+Lgid7DEX3wclFBQ3e9BQRwkQHjh
-bSmXPAmNf38OsQo6kdP34c458uAZ
+YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IDYySmNjQSBPNTZI
+TDJxN2ZhUzNXRytLZzdyTzVxWXE5UGZ3TXB4akkzZm1qUmZHNG00CjBiVnV6V0lk
+YTZrMDF0V2pqOTRyRWNuc2dvcmNlNjZKNFd5dnRyTDlqSEEKLT4gWDI1NTE5IERZ
+ekFaVGcrYWhUV3ZmTW1WYm1xSjNHM3pJVmo1andNOW9jZ1VoZDlkQWcKK1U5bFdO
+cG9SNGFFZ1NmZWs5WE1yaS9YbnFqV21kMUhuQUpUSlVFR1hUTQotPiBsLi1ncmVh
+c2UgcExSTy9HPSBVJCBhVFUgcjhhCk9oWUdLSE9VSzVPNXBESENrME5wQ0Y5WnhK
+K2pYRWZpR0V0MmpPYkw2WlNSeGxoaDA3MUZrUzFUbEN4bFo5djIKCi0tLSAyV2di
+dW5MRlRjV1lPRVJCcy9QVVpwbzlYRnBKVktPd0NMY2lmK3NCdytnCuNLmMbN/BQH
+Sg1/ML+G5VxnqmxQj6aZJQYlSNKA4Abs6A2p3+dcxfq1svAS1YyvTPs=
 -----END AGE ENCRYPTED FILE-----
--- a/secrets/toot/secret-key.txt.age
+++ b/secrets/toot/secret-key.txt.age
@@ -1,14 +1,12 @@
 -----BEGIN AGE ENCRYPTED FILE-----
-YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IDYySmNjQSB1TW5H
-VlV1VDRvVlJvRGVUTy93K2pDSTlVd1Bnd0p1QWU0Q242VWdFb1hnCk43YWJNSlEz
-ODhzM0ZVSFJNNUJJN1R4TW1wYlptQTlXVWZTZjNpNVRBTUkKLT4gWDI1NTE5IEZy
-ZkE4dXQwV2Y3MXg5Vm1mUkFBeFJnczNxdElXK2dhbjZDOWtEZk9LbncKRkc1U2k4
-SWxodUJpb1hBSDNWb0wzNHpTZi9paGRaSXYzWkliN0g3ckZjOAotPiA6LS1ncmVh
-c2UgTndiRlZVUi4gVUNSTlFIIHU1SFJIJXxvCmhYVzEyTHBDWnZrSUFOVEI4Rmpo
-dlA2ZWZOUWpiaFZtNVdlaDhzdkNBTTJKbGI3WlMwUzA4K2c5UVRWV2tMU28KTlEK
-LS0tIER3YnNCUUxzTTZtc2ZIU3VpamhxUlVqRTZndUdKSEpkYURpNmtGaU9mT2MK
-ydZSdgnTnOeJHXRQt0dx7zpvIRpmliW9s16xqbev1QVn7NO/WRx0x8bBzoUWr44V
-R5n7KZUB7dnIMEFx4PAszHMwaEV6/n7hXLofxJUsCNBBTK1qiCF0mJ4fv8LPX3bO
-wHGwx3FLp09OiAMIrlLuLssLa+9M4jpxGAF4JdL7ssSRry1mcXqcB5HIUfgIgqgU
-tSa1psa4593cA8/VSkShndw=
+YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IDYySmNjQSBoYWRk
+d3p3VkRuLzl2OFZjZlF3Q1VqR2FRTTA1c0Q3czBTSEdhMlkvWVFjCkw3a1FINC8x
+OXhhL2Vnd3o3bThEVXVwcjArWVNKUUdTWWZHVGVteTFMZ3MKLT4gWDI1NTE5IHhK
+aVh3clJ0dzRyRUl3eUQxUmdwMWFsbFhBVmNUMjRObmZYdnBEeS9tSDAKcENsZFBv
+amtqclBHTE5jUWU2ZzNLOXMrTVBxb1lmZHNZWklkT1loMWhMZwotPiB8UUxNXyJk
+cy1ncmVhc2UKMHFWbwotLS0gSkJMOWxkRFFxNVFYcktyZnE1K0g5MlhyYW1lSmQ4
+ZUlBeloraHN2aTNrawoC3mtahjhOnrOheeiaOCt+sdMERbeQhv1Ubdt3+maEXbAE
+/VYKuFEnmiR4NbOQMVdtFLJISpDhgm92rUSrJhWH6xkGLKLsRi/cemrfpO7xsqgu
+iGIpE+lzGRo1j2QlZp9MRCT07failYB3icT6Gzry6/Wh/nKqbHmsorFqNGWD0Nx1
+9/s2wsTWQgOq+jwskI3E93tj28CBqJ0hawPoqAcQgQ==
 -----END AGE ENCRYPTED FILE-----
--- a/secrets/toot/smtp-password.txt.age
+++ b/secrets/toot/smtp-password.txt.age
@@ -1,12 +1,10 @@
 -----BEGIN AGE ENCRYPTED FILE-----
-YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IDYySmNjQSBZaGx1
-QWtaUlFoWjFGaW8vQ1ErRTVOekxDclVac2tRVTd3YmxmUnRIL0ZVCnVsN29NejFL
-bUVXWkJWd0h5QXRRZzB3RmxETjh0MFJLZThQM2gzUkp6TkEKLT4gWDI1NTE5IGYz
-Y3VReVduN3pDdzVGYVdubFIybEUzUWhLU0p1UGw4aWxBM2lZSm9tbWcKYVJtRVVt
-cFFHT2tjVmJQTXBpNjZnN3dSVzRqYUREVi9MdTNpTDdkUDdzOAotPiA2ViEtZ3Jl
-YXNlIFEsYVpfTiBEeVdoTmE4IDc4MC4zCnF4RUlJMnFreFFFMElJYUhOTHNuOFM1
-YlVjOHl1VUNYaktKVmZjd3JXb3FXRTJNNHp5Z3R6azUzSjR5UHV4cFIKUlV4bUh4
-dncvMHVsaEFOYnkvSXFMWklyRy9nCi0tLSBNVmMvRzhZTW5lcW0zb0lNOUo3N0Jh
-R3ZGVW16Q21uL0J2YTMzYmFIRXdZCnYDb2yWshOHMpn7o31CmWl+95kx3d85kfUQ
-CRAPe/kFRHoPY5y+ySJMQpFSQPuLbiw=
+YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IDYySmNjQSBSM2Z3
+ekNocE92WUttdGJHNmdjSGR4dEtRNlBtbzlRZVF1bXRWbW93Z0VBCjZFOEtoenN4
+TmZjbHgwZ0d5K0tsNEcwc3ZmTXFXOUxMbXNQT3pYeGR4aFkKLT4gWDI1NTE5IEJW
+TmxicHVOUXB5cGxKUEUzdk1may9QSmt6MC9XK0VlVEdHQ1o0dTNKQ1EKQUIzQkRm
+L1RsMUhYc1A2UGdxZHRYK3RsYThEeTB1eGE4ZlBDOTJ4bnJxNAotPiBeLWdyZWFz
+ZSBsLlx5YENYXSBVeT4tX3UKVjJUYVMzNUtuRWFhYWM1K3NtK3hHa20zCi0tLSBZ
+clY1OWNVK01paC9TUGNiYXFRMFY3OEtnalNzRVk4dGR1Qy9IUkxtTFFRCq4OXLIZ
+U8E6CqvSYI/88o9Gu5OyLuqF07KGrdGaqS43jwxL1sLvPOB5Fojl+twzkKU=
 -----END AGE ENCRYPTED FILE-----
--- a/secrets/toot/vapid-key.txt.age
+++ b/secrets/toot/vapid-key.txt.age
@@ -1,13 +1,10 @@
 -----BEGIN AGE ENCRYPTED FILE-----
-YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IDYySmNjQSA3aWF3
-YUJXdE1WSWk4dGpTakExUnZYWnBrZUtIVStoRFVGQlhCY3BZNEZzCjFjVVN0WXdo
-STFjSmNad1FDM2VDSEFqTjRYYXhGNUlOWW9qNVlCZnYrSWsKLT4gWDI1NTE5IEJn
-YjZrZUViL1BxdGdYcnFmS0ZSWDBpc1Rwc2EvRU1nNFN4Z01FZUp0aFEKaTVxWExV
-a1kxVWs5WitSVmJXRHZnQmhZUENyWUtFelBlcHFXOTdvbDNadwotPiB6R3whQ08t
-ci1ncmVhc2UgJjZNJ306LEwgISkya3FjPy0gXTttYktLLkAKVGFpUHZ0MkhtTVZ2
-R0QvaldkRjUyNFM5QkJBcjlJdTNYTlpxSUJXcGEvVGxoRnp1aEhXcWZrWW90cGpk
-a2dieQpkS1o5UzNXckVmdHQxWVJxVWdDR2k3UHpOdFBkSnNvdGNZWklRNGsKLS0t
-IExIakhWNDNMWGg2dWVUNVc2cVY4eVJldVF5MmJxS3AzaDg2OTlSeldVMzgK+Tmx
-EreylKWNIvE6PAPKbiG2fHVeNDeuxEn+HzDGxQWe7DFxgvVB15NcO0JekX0FjbB6
-y1Y1rI06z2WQsTCPfVPaM39eq6zPufKqT/Y=
+YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IDYySmNjQSA4dWZR
+S3JVejhWWmtLSStybHc4WFdNSnJqRmtKZTlyRzdMRFZqbk5IaW1rCnBEVnBLS0F0
+WlljM29FajdyRE5Eb3pwTGRjU3Jtc1pvMjJkOXJ5bjdVNWcKLT4gWDI1NTE5IFo1
+SlpCTzlrRm41WmJNMDlDSkMzQ1hqNFpWSzEyVFJmSkJLK1k1S0tRMUUKRzBoZEhE
+S1l5aThJb01OeElUSTkvNVZFamZLMER0Rm9iQWp0bzdBaE9FTQotPiA4LWdyZWFz
+ZSBWP1UKa1FpRW1KZwotLS0gdkhROGN3Sm9pdUdmYXBweEc2SlVmUWcxV2gyaWRr
+N2NJVXBMc3NySUx2WQpsqVSaIYhl1132iL2SdwphBKsWLzqvBi3Qh1PVxPWmiyyE
+OFv8bWSRUq0GPsM3wU6s7oqZlTjfCaN+LbbHRnoByJUmugibPSFnLLktyA==
 -----END AGE ENCRYPTED FILE-----
--- a/secrets/user-passwd.txt.age
+++ b/secrets/user-passwd.txt.age
@@ -1,63 +1,65 @@
 -----BEGIN AGE ENCRYPTED FILE-----
-YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IERMTWVGZyAydkM0
-SGRZekRCQXFxb1ZHYnRKNUVzNGZEQ3d6QkZhR2Zvdm52RVpyaW5jCm1VamRSWWlq
-b0R2d2xPanIvYTkzTUgzODJYUkZEMHVHME1sQllUUkZsVDAKLT4gc3NoLWVkMjU1
-MTkgM2JCM1pnIHVKRFk2djBXbFdsN2IzNERuYTdielJWSkZzT2ZlenA5YUI5K3F1
-UC9YUjAKRFVGZ0x4Y1UzdHpWNXBudWVjVzVWNk1qTFl5MTg1ZXpDWGphc3RpVk1O
-cwotPiBzc2gtZWQyNTUxOSBxKzBYY3cgSGRvRnRXWSt0cDE2aXlENlBzWWMrd3Nl
-ekxuNEZhSUUvRWd2OXJ3Wk0zdwppa1YybXYyWjBwdVpDbEljS2s2WXlRNXVsbHlT
-SVBDckdWQ0dFeDU0R3ZBCi0+IHNzaC1lZDI1NTE5IFpCM2U2USB3bStyOVpJb2tu
-elBhK21sVGZlQU54c0ZoR2xrNkcvYlFxSVlFeHZSLzJRClVuR3JhWVBBckF2aEFK
-MTFDMk5KNmtpVXo4Zk9ZdmFudTgvUTNsZmU1dXMKLT4gc3NoLWVkMjU1MTkgajY3
-RlhRIFRGblV3ais3RjkxTmFPMWw4V2FNcHlJOHlwVlc5K3B6eWlwY1hrNkJJMWMK
-UGdkN0s5RS92R3VNUHVRZWpsSDZERWxOa1RaaUJTQXNUamkxZExYa2p0cwotPiBz
-c2gtZWQyNTUxOSBjMFROYVEgK3BtcnRSSUJva0c1QmVOdDJhSTVRMXBhVEk5YnE1
-ZURYOGg4Nng2OXZSQQplL1BLS2VWZDhHc041RmlMZFA5Y1JzTHpDVzd1VzI3by9u
-eXVwV2l5KzlRCi0+IHNzaC1lZDI1NTE5IG44Q3BVdyBvZFZhM0pONzdjN2labFNN
-QW5MSVRTOWUzU3lNL3JrenRZTEhMQTRERTFjCkdVNTdQQnI4VG9hbllRd1JHL3Bt
-ZVB0OHl0bXJRWWh0S3lScDJtZHZWSWsKLT4gc3NoLWVkMjU1MTkgakk4UkFnIHFw
-azd5NnFMWXRCZGViNytZTm5xS3ZxM1lpQ09VYUYzR0MrRzkwcEg4VGMKallwWTJp
-YWNXUmNUSWNTN280WWlFeFBtSnFyWmMrR1o5aUlsTXpZYTVEQQotPiBzc2gtZWQy
-NTUxOSBoTWE0bncgZkF2MEZNM1hQNmllcDY5VlIybmlaTmJTM0FCbVBxaEhnY0ls
-V3JmWG1pOApJN25wYzZKS3lWVUxMWTBCNm1pSnkrdDhLcVI1QkNmSTREWWluclcr
-dWl3Ci0+IHNzaC1lZDI1NTE5IGV5cTNkZyA5a1JMdUd5NFpZc0ZHRHFHNzBwbDQv
-TDFBRkxHN0h4Q2gyYXFFSExqR0hjCnM3aUhXcjZMdmtZWGRPZ3VNQWorSE9pQzJh
-d3h3ZHdwbHc1djRiMENqMkkKLT4gc3NoLWVkMjU1MTkgN1dROVBBIDVqYVZuTzJO
-MVo2NWVIdHF3aTUxNjdESWZMd0NvWmVTYlB2WjMvUzNzaUkKUkJ3Ymh3OWJ2dUFK
-ZmxsY3B3N2VwWjJzdkxjTDBSQU9mZFB0a0h6RTJSOAotPiBzc2gtZWQyNTUxOSBn
-U3hQMFEgQmd0MWNBS3ZRQ0xPTXI2K01Ram1zK2ZBdE5yZXZYZnFGUXNVNUoyVGJV
-MApWNUZRNmRDQThPRFJsSTk0dDJ5cU5oK3J6bjAxbXVLcnJxV3JwTHVCbkZBCi0+
-IHNzaC1lZDI1NTE5IFZGY3c1ZyA2TXhrVDlHbEx3YmhPZW1nV1RKb2g2dUw2NDhS
-d05MSS85cnY5L2k2NndJClY0RXpmVk5WYkxnc1dZUjZBRGxsUmxMeXdTZWFzY2tz
-T1Bqd0x5amdMK0kKLT4gc3NoLWVkMjU1MTkgaGtidHZnIEJkZXBCOHZKMXMzRktr
-VXpXY1hrbFRuRkVnVFFGdE52dUV2aTRQazBhRG8KSWlDbEhwRWNKV0tJMHc0U0Nm
-dEdxV0ZSdEErM1lWNjdUcDRxT3Vnai9yVQotPiBzc2gtZWQyNTUxOSBldDJ6cFEg
-SU1QV2l2WTYyeEplOVpaR3RwNWtoVC8yYXRmYzM2clRlS21zQm5RNVB6awpGZXNh
-T1RCMUhtd2Rab1hzaGFvNmE5M2RPT0dhdmhPK0IrdVArV1JTc0F3Ci0+IHNzaC1l
-ZDI1NTE5IFpOcUlvZyArRmhMWjdmbUw2TVlqQVdKcHVadHVkWlZIZGhGYTFxeDlN
-OHg1d0JCUGtzCjRLMm5yS3hGS0pnRHNFSUREcENnaFhuN21DYUZYcEphR1R6MjlL
-dCtnUjgKLT4gc3NoLWVkMjU1MTkgQmFRbFJnIGRuN1ZtazQ3SW5WQ0VvdnNlSGdE
-Nk55WGxIZlJ3Q2U2L1ZlQi9CbGthejgKTHM1SWwrclliVWRFQWRMY2hvTzZtSlNV
-VEROWFNKQUUyRCt3MTdYMGJBdwotPiBzc2gtZWQyNTUxOSBzK3FSZmcgUXFsUkpY
-TTVydlpEKzY3MTNuRERqeTBwR29JRHZWaUduQmFZbTBXUWxWTQpJb3h6SGJjZE5J
-YjhrM2cyT202WTZQbzZCNmFlMzdCV1hnVnJuYm5CZzdNCi0+IHNzaC1lZDI1NTE5
-IDYySmNjQSArSzF1MTZmL1J4TFkzOCtJOVRrZWIxSlIvbnR3cCtWKzhpWldFaWJN
-cUU4CnlRQVNoOTZodnFHTFBraHRrV3c1cFBQeWRheGV1empHREI3UGZ5TjhURzQK
-LT4gc3NoLWVkMjU1MTkgL2h4L2RBICtoU0RWUU9ETGl3YWprN051SUp5MG95b2xN
-NUJTbWM2L0h1WVU1NS93MUEKUTI0blFnZFFpQmhEL0h0VDY2R1UwU3llVmp0Ykpo
-cXNwM0RGbnBML1d1QQotPiBzc2gtZWQyNTUxOSBISi9KN0EgWTdpRXZMenhBQzla
-TW1HVEtaVmtTQTl6Y01xSEY0WUc0a0N6U1NBVGRFbwpRVUF4OU91dUNMM2Q3Zk5i
-VHhtazAxMXJ4U1hXdnRQTmpUMnIyN0VMS0w4Ci0+IHNzaC1lZDI1NTE5IE9FcU1z
-ZyBWcGNIV2tvMnNiK0plVDZyYzVMT2hHWlhLdTZhWlZremQ3Y0xjWjBMQ1djCndh
-a3ArQ1JwbXFpbklVRzh5TnJEa1M4NWd6c05FMjlOYlNCeUFIeDdvaUkKLT4gc3No
-LWVkMjU1MTkgL0VKWHZnIDBRMWJIRlF5UFQ4ZDVsMkVxRTh4OVpTQkRIUXhpSjZw
-aFRpNDBBRW9BR2cKcEEyaWdyQVgyT2o1V21VU2dhQ0kwdUEyWEJ5UmpzVElHeTU4
-THhWN0dzYwotPiBYMjU1MTkgbWtPL0JINEJUTlcvcjZkS1BGVWhnVXV5SXE1MVZ1
-clYxYWkwcnY3eGxTRQpveVlhK2JIU28xSFk0WWRKcGNEV3oreTBCUUdLRHp3cUN3
-aDAzcG84MnZVCi0+IHw4LWdyZWFzZSBaR2N1ClB3Qk94Y0w3U3JRWlBOZmFENzZt
-Zk93d3IvTWdtRGUvWGZFd0NNd3RtSVhIR1RWVG5pZHJsR2wyCi0tLSB3UE5Gc2dw
-OEZYVCtUVjQ3aXhqKytPWmxGeklXck5WT0VxNEd0MHE0ckkwCusXDXRSzFKcOUY2
-zgXpW9CiLstsVe97nwa4adU9nSK7mujBnLUHeRxvp7Swv04uaOS0KpFLkzHoKDcX
-iGLsmONjHnuEUrIQ585nAI543aYYMj9FpoHUETINYhKePSz1zHyRtAVTxs1OymK9
-BGAcPC7itvW5mO5XPGZ84yBCWiXEdKRX2zs2tWvDrj0=
+YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IERMTWVGZyBCbWE2
+Z3VySXNxb0NwbFF0dE9JUFFkRnJoWVAyUDBKNGRqa3c1amVKc1JRCnNJMFUvblVk
+UnNLWG5xYytGTzk3Y3VRQjZMU0N4RTFtOWRnOTYvMC8xSlEKLT4gc3NoLWVkMjU1
+MTkgM2JCM1pnIFZNM0RSZy9oK2tCN2lmdUFteTh4YTNMRW9uZ25FWlptcFl5SXJv
+MG1XMDAKY1R1K3N3Z01yK3J1Z3NaSG1vUG5pc1ZEZjZ5bnh0M2g3bEp1OGtIMFFF
+NAotPiBzc2gtZWQyNTUxOSBxKzBYY3cgZzZsVlhZKy8zYXUzOHpLY2NkOWF2M3dR
+Qkk4YlRSS0Vud3pEQlROTWZIMAprVFo0YitLbVpSU2wvVFpJMzM0VnF6K2RvcnJV
+M0F6bmx0QUpaQ3VldzVjCi0+IHNzaC1lZDI1NTE5IFpCM2U2USBKb3VqSkZVUGM4
+TFZwQzRpbkI1QXVTMW1RTTVCVWYwRnV4blkxV1pYZ1ZNCnlXcnNrWURHOGdPTStR
+czNzZG5RVGtscmwrZy9hQy9lUXNxT1lsalFqTUkKLT4gc3NoLWVkMjU1MTkgajY3
+RlhRIHhuVWRnN3hVRUxmUGpNV1NVSWNDVTJSOHdQbjhTakpUbGN3M2VWNFJlWFUK
+TTBjMEdsT3FhZkxrZ3p5UEFxMUU5WkNvdVloM2pnWE4rekgxUmR3VzFXawotPiBz
+c2gtZWQyNTUxOSBjMFROYVEgaEtNVm5jMEdnRURRRjMzenF1TzAwcGV3MlJIUnZE
+RFJQZkprTEFNQUFXWQptdlJpeC9BYkhQeU1JUTU1VlRJWmFpRnA3aW90VTk0Qk5H
+NzVTL0tjNWxRCi0+IHNzaC1lZDI1NTE5IG44Q3BVdyBRSUZPaVJRRXVzWE4wNTNT
+dlcrbkFUTVdTWFp6VWx5cnJKTUZXVXNDcmpZClBVUGZrWjlvT0lJQzFHTkNTUUU0
+S3UrNmkvbDlCYWhZa3p5VllTWkl3YTAKLT4gc3NoLWVkMjU1MTkgakk4UkFnIEJB
+WUVPdnBsTFJiN3Jia3A4YjBoMVRRR1hnNnl2bHpPMUNxQWpYcUw2amcKMUh1dG02
+cm04bHR3UEtpakd6ckJEcDZEMDhWRC9OMUUxT29hblBpOEZVTQotPiBzc2gtZWQy
+NTUxOSBoTWE0bncgWCtWc04xNy9mQVFRaGc5a08wQzltdkJQOWxzdFN0U2ZLVUJE
+dmk4SENnUQp5TkZoMWZSYkliY256QWVFT0Q3RVFqSEdSVUdNVm1rNmxRVWQvaXBw
+V1M0Ci0+IHNzaC1lZDI1NTE5IGV5cTNkZyBpbVBEQVhBSXJrendXWTRiSUZsMFdp
+ZjlDOUNWVW56WkhmNCs2QzB3OEZvCnkrSXNDMmI0ZVZ0MGJNWG5od21YSGxaWFRF
+Y3ovb3YweFpuM3NiaGswWEkKLT4gc3NoLWVkMjU1MTkgN1dROVBBIE16RGNRVjRP
+bEhJU1FWVWt6ZWtUZFltSldtR042enVvVXllZ3ZSRlFkQnMKMkhXLzR5cm12b2pH
+N0w0TlVBM3ZIb1FIQW5SWkxQaE0wVXlEbEUvSnJkbwotPiBzc2gtZWQyNTUxOSBn
+U3hQMFEgR1ZrUnBhRGJ0U01CTjJRcndKSjVPK05CNjFLa1JDY0lEOUZVMmxRY0V6
+bwovUXhVajdpTnNsc1ZqSlNoWlJjT2ZXM2tWeXJUMFJSeDNodlB3Q0w2T0RVCi0+
+IHNzaC1lZDI1NTE5IFZGY3c1ZyBpR3Jjb3lySmRLY1N2dGM2SS9ZMzFQUC9PaUxh
+R0VPSzF2bmRsTlZkR2kwCkpPdzkyMVNLZ3hzY0FFVlk1dENHU3YzSDlCZDFUVUVU
+K005SnBqc21LcWMKLT4gc3NoLWVkMjU1MTkgaGtidHZnIFFQNThUdGQ4dHU4b1BJ
+dGwyOFdXd3RyVjA5VGNOdVI0TnJQQ0ZYQ1h0RUkKRkg3UkYyNnF1NGlzTlRraStN
+bjJZREFLQWZmUENZaXk5Zmh3YXcvbUNqVQotPiBzc2gtZWQyNTUxOSBldDJ6cFEg
+aHkwR0VnMFB4MXdHSVcxbWpveFFlR256RkdVVWY1TlRQeDErcUFMaU95cwpLQzY2
+Z3QxZVpFT1FMUTNHbThzYU5uUEoyUE1ISDluQ3dmWGY4UHJFSDhzCi0+IHNzaC1l
+ZDI1NTE5IFpOcUlvZyA5MHpuaTRURk5YKyt6SHRUWU5iUUlHQnJCQWhpRDM2WjRL
+ejRTNjQzY2lJCmRFdlRxdmlYaEsxd2pNT0JINWYvS0JEOVVhRHlZOFRvSnB6UEov
+UHloUW8KLT4gc3NoLWVkMjU1MTkgcUxqcXlRIHpYVHloWTVsU0lxdmdleGFXSTdk
+S0lYWG9VQWdLTm1IMVdIN1IwMzJQd3cKY01FblYxTUJWSGczUE9TdHQyVEo5dG9R
+djMzajljSEhMaEQ2MXRPR1JHTQotPiBzc2gtZWQyNTUxOSBCYVFsUmcgMXVYM1Ew
+R2tCYW1uZDJGVXRhT1hJQjhOMHU0N3NyVDJabU9SUVltM0ZsUQoxeFpocXFZN1Qw
+eFI4L2lMR2xmalFrUjlZajkwYTJBbWtqQnZCU09nQXdvCi0+IHNzaC1lZDI1NTE5
+IHMrcVJmZyBxd1V4cDR2RzFFMkZ6a3M3KzNiSHdpbFd5WnptdFF5ZENJa0diS2hY
+R1dNCjB1TWNSRVAxRDMwS3M0K3FCWGdGdTFCeVRnMEd0OVkzZkVmWWRnUFBKdTgK
+LT4gc3NoLWVkMjU1MTkgNjJKY2NBIDRpRmJJYUFtazZsUDdlVjduNzk5UXdHTGxD
+Vlo2OU1KQ295ZnVlejZCVFEKdDA4WkFBME9yUGIxbWxiNlg0aDZ3NEZYb0hLM3NT
+RXV2cHEwczk3SWV4MAotPiBzc2gtZWQyNTUxOSAvaHgvZEEgZ2p2MUJpSnBjcHpk
+djZoTnVVcUJPNEZNdzd3U2ZSTVVPS1VteWdCWFp4awp5VGNHN3NCT1M3WmhnNk1W
+TGMwaUh5WW0rOWZ1TjhGTmp1dmo3WG13eW5rCi0+IHNzaC1lZDI1NTE5IEhKL0o3
+QSBtQ0tsaHYzQytPR3VzMEZFV0ZsM2FjSjBjUE9wTVcxNFp3amlXVjIyL0NvCmhr
+eWgxcHNabmYxRHNGRXNjN2hLQlVFNUJIVmZ5STlUNXFTN1MvYWNGSWsKLT4gc3No
+LWVkMjU1MTkgT0VxTXNnIENDSzJEeklWTVhTUGVLLzJCdzdqTUR2dmNvaWpmb01r
+QWNnZVJrYlNQaDAKK1VvME51VDd5MFNDc1NKcTJIY1FGVktGdzNqS2YwdlRsUGpU
+YmM1SnRrWQotPiBzc2gtZWQyNTUxOSAvRUpYdmcgRnRROFBEaFBHSUQ5LytRdmY2
+Z01rYThudEpreWxqOG5lMG1VQW1oZWNscwphai9wZlVEMmZiTEdGRldiVjhoOHZn
+MzVzV3BZTVdIYnoxMFRZZGhwelJZCi0+IFgyNTUxOSBaa29uRUtnTUpUdENCYWU4
+MzRiR0hDQ1VBdUdJTVRjWlFqRUV2cjdVSWpFCjQ1WE5HUHZWWlVoWHdTaEROV0xs
+T3dzb1hMSXpEOGpNTEJYNG9vZFZWeW8KLT4gNzNVci1ncmVhc2UgXjBnICgtV0o/
+MyAoSGRYCmZmWGZ2QmlRNzMwWW9nCi0tLSBWRkNaT0hTMWE0RkRScGc1dmxzSUJU
+c0FWNWZOZGdPRlViMGFKYkV4TkhjCvuic/zmjPeQ2G6xQR5nrNlh9okvfx/6P1UO
+Ve020dqS2rsbDuCPYvtFMUu4U8C5f3aWXlz+pjoA6veWvYuW8XK7RhMjiEdj+yoZ
+Sb8naVGt8FBLWUGgOVYujMSPhcgvkDoYQDCoPCxzNM3C4SBRMfAZFKxq7uxSR+/g
+VDa9t07/qZFHWriBMpDAEgc=
 -----END AGE ENCRYPTED FILE-----
--- a/secrets/vaultwarden/backup-pass.txt.age
+++ b/secrets/vaultwarden/backup-pass.txt.age
@@ -1,11 +1,12 @@
 -----BEGIN AGE ENCRYPTED FILE-----
-YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IEhKL0o3QSBRRDl1
-aXBQSlk5MU5sdzVIM1pGckVkZStob2pEVjl2TitTZytvRVZVWWg0CnUvSHZDeVcx
-QTVXZlJtS1ZOcVVUWC9DanU1ZTRCUVpGaGFBdCtwNU5idkkKLT4gWDI1NTE5IGxM
-bjZpSFBWTXIxR0w4bHAvWkdCbnBxOEI1RHUrWXBWalZTTTZwdEkzd3cKSkZmQkp2
-MlFtSzRENW5UbWJ2VytaNWR1Zm9jZThkSFhuczZ1bXB2S3AvQQotPiB5Ky1ncmVh
-c2UgXlx4KmcKL0MyN0xzRGhqY2FBN1B0dHRSc2N4aGFldUNiQzRBUGh0Zi8vb05v
-ZzdDYkpTMklMNzV3N0s1L3VUWHB6OVcvdQppeDQ2YmhibgotLS0gVGw0cGFpUUVW
-NENIbTJHSklKV1hhNzduYk5qQ0tYbjdsaVhLMnFkSXBXVQqOfcVXqF6qEFTS9RQS
-Dr2aCba7gEuy3whnFLoGa42eHJmzjSE1G1k/z5anH4uiT5cC
+YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IEhKL0o3QSAvMDlX
+Y2htZ0IrK283OFZLbDBabmZ5NVFUZ0ZTV2NJVDliY2U3TmdrYmtjCnFQZ0sweXNZ
+MHNVc0M1VCtyb2F4MVV5NzFHMjdvaUNqTVNYTTBMY2MvRU0KLT4gWDI1NTE5IGE1
+MFAvejQ0S2NGZVFHRUFUcTJhb0l0RHhyeUhCMVNOSVQzd1p1eEhZSDQKZlFlUUti
+Z0lEakdwOTBiMjBFUTNLTnJoUE5RVm9pMkp1SWVBVWgrT2hWYwotPiAnKUAmLWdy
+ZWFzZSArJyotK0RHIFZvKyAveWcxIExHUnJgJW1BCnJRd20xVytTamlZMWc1UTJO
+M0lrVys3YTBVRkQ0M0FWbU1RdktaMk5oUjVKcGtJMTJaWkUyY0Q4dmc0VE9qdjUK
+eHBPbDdpWnpRenhqQkFSTlFYdzlhRVNHZDFXenlaNC9GS0VHcThoUDBRCi0tLSBW
+TTBvOGxPaUxWQk1iTGVmVjlXNEpDZGRsNjQyVE0wTkxQazk1cExtdmFrCmcpd1fB
+wh6TaxepC4FzzcvEPdslYJNjRn/gpVKac5E+XepVwWIqgIlXgMg6MXSeZRc=
 -----END AGE ENCRYPTED FILE-----
--- a/secrets/vaultwarden/backup-ssh.key.age
+++ b/secrets/vaultwarden/backup-ssh.key.age
@@ -1,81 +1,82 @@
 -----BEGIN AGE ENCRYPTED FILE-----
-YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IEhKL0o3QSAvbGhl
-bEFsYXFlRDRvV2l1TjhHb0x5dHVteHVuSmRUb0psckgxYXdyU1cwCjBPTlBNTWFk
-RmQxZnlrSS9uL01DbmJXUm52MDV3cTNDL3paMGhvN3dlcEEKLT4gWDI1NTE5IFdz
-aXhkMHkrQjR3U0VmdVJTZmlPWmc4OXFGUUhTSlhUNE44SHJvUU95ekEKT0NDc3NW
-THZCU2lNUUtJcVpmc1p0NERsT2g5SlBZYUJPVlZ5M0lISFhxcwotPiBCLWdyZWFz
-ZSB4KXtGOiBMIylkfEw1Cm1NT3RHU2FvNk9Ncmh1b05YeVZhMUc4dXBHSHhSYTIw
-aXBwUEdWY1NkcHFmWHNpM2k0eTgrejFBMElpYitUWQotLS0gZ1Ivd1ZDOEw0eVMz
-cXdLNm1UZ0JkRmIxY3piU1Y2Z1JnRkJ2VmVjb0E0YwpPptmknLXXJ7cUCPOlFGdM
-7AmCtydE+7n2VI8HQLCIR55y+etLkAlsu/yxHACV9bAf+wb8Z8uVEQAlLDVa2nr2
-vJ9nG3WIZYo+VotxHBqabP6P1I2wF+CvMmjRUFxiknF2zf/oyglBjZ4PgCf1SvL9
-cStuFHG8MbKc9/ctW+azDiAyxGKf4Mv/4mddZGsjDyvLvo4qspfsW1mRd6b/5XTJ
-2haO7U66RyRGlITYmF5sBmQL3JhAJXRniayYgJyIULX+AChfeZO7wXa7r3YzBiF2
-eGBvZhcoubUQzgXi/CiazM6EwALgi2IarugXBGtjuqh0Z+qqsGr2ZT+Big5OcjBs
-gZ8aWsO5Ty7Q/evk/4I0uflYvG22CaoYgx4Iihr09fpVI/vsRKAMh2bJJ6R2bSJK
-pK3FpJonOFM7QFrOESYfAdkmxFqcpTCYY6WIX3riYE6aebV/kF+8snUmZVCBgTo8
-8WI4tnNn8uRSqwn3F29LRDQQKdgiopCmvfw67BV6SW25OH4gkT8PkbmhTjjwd4/w
-xcFYk00aVIYqEqAM4vi6qAwG/2JlZ9h21wgjySqoMi1larqDqAVbHaUTalFKXOA6
-re957mMdbXUooO8OKJ+8YrgkEdV0JliE5dhfP/4MHr0jMzzec3mbmi/rbA22mKUl
-uy3jI0mbR/NZitfe8ifm4Rw2RL4KqPSd4E20LqSamWiA8ClotX/qZT9oXPijdkQn
-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
-8JOhq/BDwksIDgDASYTaWgUOWvi18XuahL9NzK7lKRm2B3WROf/4ZPyzmr5a9vHj
-t1VGTmoHEU/Y+lZlk/Oeyh+RXV6UTiD+vy7TlnBnghT/VNJENszoli39L+au+Tu0
-bmV5NLMa5Ry290tezdxbhKWoHBaQ73l+Zw380kGZsVDvO6r3JQ==
+YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IEhKL0o3QSBVM0Zp
+azE5RGFxeXUxRFI5UTBiamVzQ0QralZkRWZrMHdCQnV3aFpmekg0CkpCKzJWVjQ5
+MWdIM1NPUUNTN1NFMG5KdGRuaG9kUStycmtZdFZUeHV3RWsKLT4gWDI1NTE5IE0y
+d29teHp4aDRRZkhNeXdqYnVXdGZqMUdpRDhWTlhQQURJRzJnQ0pBZ0kKOUpRZ3Jv
+VHI2djhiT1lDSnVTVDRYZXNaNUNwT1pFbENuMHU4VlF3djMzbwotPiBjaWZQLWdy
+ZWFzZQp3MFVGQXUxNmtRN2V3U2tZTEt1WnQ4dFZoZWgwWTVPS1BGSzJuZEpsUjUz
+Q1ZYdjVtTXEvTysvQmtYWWkyZzN1Ckp5YmdSTFQ0bk1rd1BydjJsQTNWQnlzZXlj
+Z2RoY2UrWElpeEYwRkIxMVFFeTBQWGR2QzEKLS0tIFpFMkZpV3huTGxFalVKSSt5
+cDNRWGNOZ09WNGhvVUhpTlVWN0hhNTNuem8KBH7iSfqIeqQIz9BvJ+mM1IQ60jGX
+grubTt5HzCbZJy0xHt3JEdvVL8NvnLojMB34Bw22wRNdk7SItyHkHip2DBTQWgSq
+qSUiH4SjVnvRKWoLW5oWGNkD04Y7eVzPiRavR717fwrX93SuijKELGAC2N2CZiy/
+/WoWdpeP6b4JikSIPYtO6OmJr/VbgYyySFmOpSqX+p3C+mG7c6kW1/j4eV6uiyNu
+jrVBhcaEmiVNwmBxGyibb0lzmbMT/3vYA9FpkE7pckC5B5Z9m9jGrvJIy7VnycRK
+1R9X4O+q7XreBCTXyYf70iK6hAF74KUIryyW5MCbXfQz3VDi5/tRt5BnacWqgK6v
+RKYqRSlE3Gw4Qnc99T81Sk9zfJAGhq4W8BBkMW88F7Dgn/0mY+CeMjEfcB/ovSJW
+YilNRF6nuuO6sBtCnN2ZUUSkknjfl8WwYqoPy2PkmRIKBLq8I3e7+0FTAu7ppHgE
+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
 -----END AGE ENCRYPTED FILE-----
--- a/secrets/vaultwarden/config.env.age
+++ b/secrets/vaultwarden/config.env.age
@@ -1,16 +1,17 @@
 -----BEGIN AGE ENCRYPTED FILE-----
-YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IEhKL0o3QSBDbXIr
-cWRkYSsrb3cvK3hKRFNoUTEvUlRNQ2dpVGJMZmVwSTEyUjRPMlJRClVrYWRTaU9v
-RmlXeE1PQVRPTnY3RkVhR1pVNzdwREsvRXFpNkZUSVFaRVEKLT4gWDI1NTE5IGs5
-aE1EWWZXSzlaZDRRZUR1dyswanZ1OVJLYnRIR3E1UlBoSDhqSmk5a2cKVktMaEF2
-VE01a2M1RGMrYUNuL3IvaFBWaHgrYkVxeFVRbS92UFNJMWJqcwotPiBsOEBxXXVG
-LWdyZWFzZSAvQ0VTOyBsLGpQNG1TCmZLY25kdU9CYnBqM3pzTGk5ZnMyQ1duUE85
-c29JakhTb3ZVUENrTjN6dG8KLS0tIFVOeUxidXhzZWlRTXk5ZklQS0I4YUZHQ3ll
-OUlRcCtma3duUWFubXZsUWMKv/jNY8YWD4syUS1xvcltY7KxFCcoHNZGpjKXIhDB
-uD/Y0pZRnW4A3V5oSHrktkVsXbWn31Pf3wW9PsZqNUrraLyZT4+kNcOhuKJxcqKL
-iLOXDng6/tIwctKabiBDy0Id0xpFecnx2irc5ei7Y9trviERL1ayGckYsZ6bCDfS
-rYFdW9ocqxkylTrk8GYhI4NkcChANCgk4jLoUZqrs11B53Nh60ZyT7kaf99mcEW7
-arv9NsuwymWQB7u0ZKfo3bhTnPTmcpa8GpYtOt6kFbgDQwmcGEvReMThgg/8Z0XK
-wcgC6+hdqfBo4PNmmlsMzh1Mp5MCw2f0QIoqT9oY0bhp8XIiq14N/j+SFZvObF0c
-wp0Z6PK/9QXmYAbIvX0eOWIJyx90oNA8zA==
+YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IEhKL0o3QSBSM3NH
+YU1mZktkY1hRb3ozZHdhTkx3NXdQVjU3SDM0MTRTejI3V2pGN3kwCjkwZnQ5TGFu
+TUg5blgrd0NPcC9ScmpCa1B1REUrNlpUNVlnVXJPQUE1RlUKLT4gWDI1NTE5IHFq
+K3B3T2NDQVBFREdJSzJuRHUwdjNmVjVBTURwL0pkZk0rRUpxZCt2Z0UKRUpFdXJQ
+SXJDNmdhYTVJcFV6UEtLdWdXUkpiSUY3SFZNNCtMOFJJcXpRSQotPiA9Zi1ncmVh
+c2UgQixfZjwhT04gXS5oYjYgIgpVRmw4Y1plVWUxaFVKQ2ZzK1h1cW5zWmdjN2tj
+VlpMbnNBYUhnVVFrTzVvcjRyQy9HeGNzeUhnMnNOd0REUjhmCksxYndEZlJiN21w
+a1htUW45NjJQeE0zbGJYNitTNEdBN0x3Ci0tLSBRc1J3aGRSUlg1emV3aVVpK0I0
+L1hSMXppcWxLamdCemh5VkU2VXlWR3ZRCnY7S2U2DydnCiMrir1vYf17Jns63NYH
+iDHIoHQHcR6Hko53VwRjZYPYYTQN/v2tpMMye9ZGB8sCqPkaCHtR8NML0Z09QMhj
+DiFf8xA6gQl8YZKcVNAK46KfuhguzNRARQ70GAU8igK5uKe7B/C9ELeRavR+VPej
+SiCL2ld3uq4o1r5HhMiROfM70ZMij0CjRhx+E9xxvmqNiZOIcyCZt7WViGthHDrV
+kKK/IBWkCAXl40AtzMQnuJySwoY2lx7TvPYmk5zZ+uA9zDZ0MFaWMtiYB+nlBjFN
+xRmOX6/TlVjIF+vkFqGzB4q9Tuwk2CiR8b9+UB/Wvrow2qlf4DYwsvtwB96nJwaj
+XkRVBJ6mALlqPNE2jYg8QuVdIc7MsHGe02uJu3mzI9A=
 -----END AGE ENCRYPTED FILE-----
--- a/secrets/whale2/simpcraft.env.age
+++ b/secrets/whale2/simpcraft.env.age
@@ -1,10 +1,12 @@
 -----BEGIN AGE ENCRYPTED FILE-----
-YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IC9FSlh2ZyBEb2hB
-cnZBRFZ5OFlvR1ZtSm4zWG1MMjFhQ0VONkk4M2hPQmlaV0tkS21vCm9pWTA4UGtE
-dXd4SnFCd3JMeGg3c0ZXZm5Fc1hWdkhxbEQzYVZyMHkyM00KLT4gWDI1NTE5IEwr
-MXpubG9nMk1wNFczQ2dUY0NSKzZoR3ZkQlBkbEtOclg3YklWeEYwR1kKZE8wTFND
-eDgrbDhNL0ZYYVNCSGRSN1dNSHlmdEVFSnVENnFMVjlOL3k3UQotPiBpNUpIRC1n
-cmVhc2UKV0JWMGdmZldNUyswR2tLdUVFRQotLS0gK0E3VFRlVXZqSDQ0ZDBvdjdl
-YU1UQkltNUw5ZndVTU1kbVZ6bDlCQjU3NAp0czfiB+B6CH87gdHFh4i6ssbAtjEC
-RnlqGXKkw3Lxa66DU0KYewcXcnTQZQSXbaVHin1KXndG7F0Jvz0po70=
+YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IC9FSlh2ZyBSODVj
+MkJKY2JIMFQ5U08yUUQxRFRUamZ0dlRKMzlPMUhadm9KcHMvSzJvCkZacFRGNzc4
+Ynp3dFFFUkloN3Q2bkVWaU5laEpjVlF0b1Q5YlVDNzlOdlkKLT4gWDI1NTE5IDAr
+WDBTUW1oSVBzUTZrY0FFMGJjY0I5ajN0eTduRFZqc3o0blRMMDRYbGMKVHE3VGtJ
+VTZPL0dKRkxrN1I5bk1HcUNSUlRyOHJhdkdYbzZBOVk1RHNRUQotPiAoITR1eU4t
+Z3JlYXNlIGpcKApmQkc0cG15ZW1qenBHdzhYQTFvamF5eTljWGI1VWo3MER1TUV1
+VEtCbk54TGdOVXBRbXl1SVFHQWIvS1dRYVltCmw5MEdncUNDSU1GRmdpY3ZkbmRp
+K2t1UlJSSHFTQQotLS0gUHJRQjVWeFppeVVFdExma041aVZJczdscmgzUVJOOGtx
+YnpzMUVhNkpFVQqEOGdn+PktfQdao87IF+SI6VoHKLdWdEGjPw2tf0DXFA9f+bc7
+SlR880WtbUKSOK9USDJucbD4sTrdogXYXGM=
 -----END AGE ENCRYPTED FILE-----
--- a/secrets/whale2/valheim.env.age
+++ b/secrets/whale2/valheim.env.age
@@ -1,12 +1,12 @@
 -----BEGIN AGE ENCRYPTED FILE-----
-YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IC9FSlh2ZyArVGNh
-MTFkd3FpcWgvdUh0WWRHZUt5ZFh0YVZ1OGpMYWlpV3RyRUxiZFE4CmpzaWtwTkxZ
-Sm9UeHdob3YwMyttMFhzZ1VIZk83cm54SFBzU3NJNTY2OW8KLT4gWDI1NTE5IG9N
-aVovZ1UrTDZyVW9xU3VJQy9DQW5VcE16cXI4Z1Q0ckNiekkrVDZyZ1UKUlBMbkNR
-LzJjNnE0NWtNWDVpb09rdFN3QWJnZXVBSCtUZUJSM3hGbm91YwotPiBKazctZ3Jl
-YXNlCmV1c0Uvam5LVTZza09aSHpqcXd1dkNGRU5YQ1U4TGFUS2hSQjdzb3pFREIr
-U0JkenQwRnQycFROK1k3dW9TcWkKY2UvTEFCTVVoQWdUN1d1SElUYk9ydzVjVlc0
-Ci0tLSBJYzlieGlETk53djJTTGl3RzA4TFEzdC8vVDB2YUlmQXpvZGtOWXNKdFdN
-Cp6v+YtGaouOaZVgI4owDV9IHizg3md8jSPK0jsp7HPKvnCFnWGZ+AXtBk0pUaFL
-1cbe
+YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IC9FSlh2ZyA3L1Fw
+dmRXSkszNHJIKytPTk85MW50b3h5b3FqRXpsMDFZQzVDcndRV1hRCkZNS09xbGZB
+eWdNZkQvM0RKQ2ZRVER0VkhlOHNMUWUwOFF3MWIwYmNmYkUKLT4gWDI1NTE5IFdU
+NmJ0eGUySmpwek1ETThsbjRkZEoweHRNa0lwZTRMSU9TRi83bkpkSGcKVEJYSGxB
+U3lIZ1B4bzAxcnRTb2EzaXBoZHZPaXN3Vlo5VW1aTUg0M1lQUQotPiAtXCMtZ3Jl
+YXNlIE8KSmtDZ0t1TG15S08vWlgvdGdOM2EraUtTb1pxZjNSYk00anNPVGM2eWs1
+bHczMlJwc200NVgzaU9GbkIwMlNnNApab3ZPVXdxMTgraEVORmJjZHZSQjN4b0U0
+WWRjcXMvYWR5eDdVNDRrcDZwdUNDcEFoU1NnUlYycDZUTE5mNWFYCkFsVQotLS0g
+Q1lPOXd3SXo4cUJlMis0UVUxUkdYV0phN3I5Tk1YNGtjOVBJMjRmUmhIWQrr1O2V
+Cp80JIgyODQZnGvx1lTQB5D7WuMnY7YOe7A+UMz5ztdYtgoK13IxdPfJ8IP2vw==
 -----END AGE ENCRYPTED FILE-----
Author	SHA1	Message	Date
Jack O'Sullivan	ffa5d19854	home-manager/common: Add `nix-tree` package Some checks failed Installer / Build installer (push) Has been cancelled Details CI / Check, build and cache Nix flake (push) Has been cancelled Details	2024-06-29 23:42:31 +01:00
Jack O'Sullivan	19fb29213e	nixos/netboot: Mount `/boot` via kernel command line	2024-06-29 23:41:01 +01:00
Jack O'Sullivan	f9870abc9e	Working "shill From Home" full network boot	2024-06-29 23:12:21 +01:00