ab

2024-12-25 14:35:41 -08:00 · 2024-12-25 14:35:41 -08:00 · 768196e2bb
commit 768196e2bb
parent 750a07f15a
12 changed files with 275 additions and 177 deletions
--- a/.sops.yaml
+++ b/.sops.yaml
@ -13,7 +13,6 @@ keys: &all
  - &m_porcelain-doll-repair age1qy9tvzlgek7fq4nl52e05ad6pyvglrtaxwjet9gr0fzq85z7cv9s6uxzkt
  - &m_sapphic-engineer age1kh4c0dmn809xzcf7ntpjm26h2xh4ljaq09r9n5s0tsjjpr55ff3qqmkuca
  - &m_git age1h9ty40uxgznh7s2d7l3cx74lkylpgvs8lknkvkjvqyy5kn5kfc8qz0zc4c
-  - &m_nas0 age18xjdme8vc657l8n7fzpn7twshprmtpc8p6usn257ajw0vftd8p8qxwwywn
  - &m_ts3 age12f24j7fcq46cjuqjftv5pyffpunyhqj98ypqf729z89xzunzryts5d8kl0
  - &m_pihole age1jc4a52cukf6d94tt2meq8tnt084rhtdd93hwzjhzecc70rmvvapqtdng8v
  - &m_static-sites age1s4hzwj982zk04kr7c5u0vlemkzalv72wtkttkgzt64xv8a4r25zqxra6u0
@ -23,6 +22,8 @@ keys: &all
  - &m_exit-node age13xddcc3njv29sxzfdx2rjctaejhsxr5rephruga7vjrvjclcapuqnwx52t
  - &m_plex age16jzuvkchnm53wfl4q0yg93zmg7jmj6rpud79sa6wuljved74hd6qvlw66w
  - &m_nextcloud age198c9udn09u87zje4ctz4j8d2k5ey5kvgl34nfn573e9csx9mcs3q7a6q2u
+  - &m_nas0 age1d6uwrdv48q7hx0nthzxwz2vw3j47eawwkya7cp6sd4fwmhu84fcqa77rtr
+  - &m_seedbox age1y8mjr0q04zy9qj8vvx6f9lcpptg6fenvw7mtdlyw6glnpyack95qcfxada

 creation_rules:
  - path_regex: secrets/[^/]+\.(yaml|json|env|ini)$
@ -105,13 +106,6 @@ creation_rules:
          - *op_noe_2
          - *op_noe_3
          - *m_git
-  - path_regex: secrets/nas0/[^/]+\.(yaml|json|env|ini)$
-    key_groups:
-      - age:
-          - *op_noe
-          - *op_noe_2
-          - *op_noe_3
-          - *m_nas0
  - path_regex: secrets/ts3/[^/]+\.(yaml|json|env|ini)$
    key_groups:
      - age:
@ -175,3 +169,17 @@ creation_rules:
          - *op_noe_2
          - *op_noe_3
          - *m_nextcloud
+  - path_regex: secrets/nas0/[^/]+\.(yaml|json|env|ini)$
+    key_groups:
+      - age:
+          - *op_noe
+          - *op_noe_2
+          - *op_noe_3
+          - *m_nas0
+  - path_regex: secrets/seedbox/[^/]+\.(yaml|json|env|ini)$
+    key_groups:
+      - age:
+          - *op_noe
+          - *op_noe_2
+          - *op_noe_3
+          - *m_seedbox
--- a/flake.nix
+++ b/flake.nix
@ -174,6 +174,7 @@
        porcelain-doll-repair = mkNixos [ ./nixos/hosts/porcelain-doll-repair ]; # Iceshrimp+Withdrawl, porcelain.doll.repair
        ps2live = mkNixos [ ./nixos/hosts/ps2live ]; # PS2.LIVE stack + planetside stuff
        sapphic-engineer = mkNixos [ ./nixos/hosts/sapphic-engineer ]; # Akkoma, sapphic.engineer
+        seedbox = mkNixos [ ./nixos/hosts/seedbox ]; # fuck
        static-sites = mkNixos [ ./nixos/hosts/static-sites ]; # nginx specifically for static sites
        thonkpad = mkNixos [ ./nixos/hosts/thonkpad ]; # t480
        ts3 = mkNixos [ ./nixos/hosts/ts3 ]; # Teamspeak-san
--- a/nixos/features/nas0.nix
+++ b/nixos/features/nas0.nix
@ -22,38 +22,39 @@ in {
          GID for the mount
        '';
      };
+
+      lazyMount = lib.mkOption {
+        type = lib.types.bool;
+        default = true;
+        description = ''enable systemd lazy mounting'';
+      };
    };
  };

-  config = lib.mkIf cfg.useSMB {
+  config = {
    sops.secrets.smb_credentials = {
      sopsFile = ../../secrets/default.yaml;
    };

-    fileSystems."/mnt/nas0" = {
-      device = "//nas0.hoki-porgy.ts.net/main/";
-      fsType = "cifs";
-      options = let
-        automount_opts = "x-systemd.automount,noauto,x-systemd.idle-timeout=60,x-systemd.device-timeout=5s,x-systemd.mount-timeout=5s";
+    fileSystems."/mnt/nas0" = let
+      automount_opts = if cfg.lazyMount then "x-systemd.automount,noauto,x-systemd.idle-timeout=60" else "";
+    in {
+      device = if cfg.useSMB then "//nas0.hoki-porgy.ts.net/main/" else "nas0.hoki-porgy.ts.net:/storage";
+      fsType = if cfg.useSMB then "cifs" else "nfs";
+      options = let 
+        typeOptions = if cfg.useSMB 
+          then "credentials=${config.sops.secrets.smb_credentials.path},uid=${toString cfg.mountUid},gid=${toString cfg.mountGid}"
+          else "nfsvers=4.2"; 
      in [
-        "${automount_opts},X-mount.mkdir,credentials=${config.sops.secrets.smb_credentials.path},uid=${toString cfg.mountUid},gid=${toString cfg.mountGid}"
+        "${automount_opts},x-systemd.device-timeout=5s,x-systemd.mount-timeout=5s"
+        "X-mount.mkdir"
+        typeOptions
      ];
    };

-    environment.systemPackages = [
+    environment.systemPackages = lib.mkIf cfg.useSMB [
      pkgs.cifs-utils
      pkgs.samba
    ];
-  } // lib.mkIf cfg.useNFS {
-    fileSystems."/mnt/nas0" = {
-      device = "nas0.hoki-porgy.ts.net:/storage";
-      fsType = "nfs";
-      options = [ 
-        "x-systemd.automount,noauto,x-systemd.idle-timeout=60,x-systemd.device-timeout=5s,x-systemd.mount-timeout=5s" 
-        "X-mount.mkdir,uid=${toString cfg.mountUid},gid=${toString cfg.mountGid}"
-      ];
-    } // lib.mkIf cfg.useiSCSI {
-
-    };
  };
 }
--- a/nixos/hosts/ingress-proxy/default.nix
+++ b/nixos/hosts/ingress-proxy/default.nix
@ -38,8 +38,7 @@ in rec {
      se.servers."${tsHost "sapphic-engineer" 4000}" = {};
      git.servers."${tsHost "git" 3000}" = {};
      staticsites.servers."${tsHost "static-sites" 80}" = {};
-      ldr.servers."${tsHost "live-doll-repair" 80}" = {};
-      jitsi.servers."${tsHost "jitsi" 443}" = {};
+      nextcloud.servers."${tsHost "nextcloud" 80}" = {};

      pushps2.servers."push.planetside2.com:443" = {};
    };
@ -151,6 +150,17 @@ in rec {
        };
      } // defaultConfig;

+      "nc.noe.sh" = {
+        locations."/" = {
+          recommendedProxySettings = true;
+          proxyPass = "http://nextcloud";
+          proxyWebsockets = true;
+          extraConfig = ''
+            proxy_request_buffering off;
+          '';
+        };
+      } // defaultConfig;
+
      "sapphic.engineer" = {
        # serverAliases = ["p.sapphic.engineer"];

--- a/nixos/hosts/monitoring/default.nix
+++ b/nixos/hosts/monitoring/default.nix
@ -60,7 +60,9 @@
      (static "monitoring" [ node ])
      (static "mumble" [ node ])
      (static "nas0" [ node ])
+      (static "nextcloud" [ node ])
      (static "pihole" [ node ])
+      (static "plex" [ node ])
      (static "porcelain-doll-repair" [ node ])
      (static "ps2live" [ node ])
      (static "sapphic-engineer" [ node ])
--- a/nixos/hosts/nas0/.target
+++ b/nixos/hosts/nas0/.target
@ -1 +1 @@
-nas0.hoki-porgy.ts.net
+10.100.0.85
--- a/nixos/hosts/nas0/default.nix
+++ b/nixos/hosts/nas0/default.nix
@ -109,26 +109,27 @@
  };

  fileSystems."/export/storage" = {
-    device = "/mnt/storage";
+    device = "/mnt/storage/main";
    options = [ "bind" ];
  };

  # NFS is banned from the dollhouse due to inappropriate proxmox behavior :c
-  # services.nfs.server = {
-  #   enable = true;
-  #   exports = let
-  #     ipList = [
-  #       "10.0.0.0/8" # home net
-  #       "2600:1700:5890:ee2f::/64" # home net6
-  #       "100.64.0.0/10" # tailnet
-  #       "fd7a:115c:a1e0::/48" # tailnet6
-  #     ];
-  #     ipRule = rule: lib.strings.concatMapStrings (ip: "${ip}(${rule}) ") ipList;
-  #   in ''
-  #     /export         ${ipRule "rw,insecure,fsid=0,no_subtree_check"}
-  #     /export/storage ${ipRule "rw,insecure,nohide,no_subtree_check"}
-  #   '';
-  # };
+  services.nfs.server = {
+    enable = true;
+    exports = let
+      ipList = [
+        "10.0.0.0/8" # home net
+        "2600:1700:5890:ee2f::/64" # home net6
+        "100.64.0.0/10" # tailnet
+        "fd7a:115c:a1e0::/48" # tailnet6
+      ];
+      ipRule = rule: lib.strings.concatMapStrings (ip: "${ip}(${rule}) ") ipList;
+    in ''
+      /export         ${ipRule "rw,insecure,fsid=0,no_subtree_check"}
+      /export/storage ${ipRule "rw,insecure,nohide,no_subtree_check"}
+    '';
+  };

  networking.firewall.allowedTCPPorts = [ 2049 6969 ];
+  networking.firewall.allowedUDPPorts = [ 2049 ];
 }
--- a/nixos/hosts/nextcloud/default.nix
+++ b/nixos/hosts/nextcloud/default.nix
@ -12,13 +12,22 @@

  sops.secrets.nextcloud_admin_pass = {
    sopsFile = ../../../secrets/nextcloud/default.yaml;
+    owner = "nextcloud";
+    group = "nextcloud";
+    mode = "0444";
  };

  services.nextcloud = {
    enable = true;
    package = pkgs.nextcloud30;
    hostName = "nc.noe.sh";
+    settings = {
+      trusted_domains = [ "nextcloud.hoki-porgy.ts.net" "nc.noe.sh" ];
+    };
    config.adminpassFile = config.sops.secrets.nextcloud_admin_pass.path;
+    database.createLocally = true;
    # https = true;
+    home = "/mnt/data/nextcloud";
+    maxUploadSize = "150M";
  };
 }
--- a/nixos/hosts/plex/default.nix
+++ b/nixos/hosts/plex/default.nix
@ -16,6 +16,7 @@

  internal.nas0 = {
    useSMB = true;
+    lazyMount = false;
    mountUid = config.users.users.plex.uid;
    mountGid = config.users.groups.plex.gid;
  };
--- a/nixos/hosts/seedbox/.target
+++ b/nixos/hosts/seedbox/.target
@ -0,0 +1 @@
+10.100.0.87
--- a/nixos/hosts/seedbox/default.nix
+++ b/nixos/hosts/seedbox/default.nix
@ -0,0 +1,52 @@
+{ inputs, pkgs, config, lib, ... }: {
+  imports = [
+    ../../templates/proxmox-lxc.nix
+    ../../server.nix
+    ../../features/dns-cache.nix
+    ../../features/nas0.nix
+    ../../features/podman.nix
+  ];
+
+  networking.hostName = "seedbox";
+  system.stateVersion = "25.05";
+  nixpkgs.hostPlatform = "x86_64-linux";
+
+  internal.nas0.useSMB = true;
+  internal.nas0.lazyMount = false;
+
+  sops.secrets.protonvpn_username = {};
+  sops.secrets.protonvpn_password = {};
+  sops.secrets.protonvpn_ovpn = {};
+
+  sops.templates."transmission.env" = {
+    content = ''
+OPENVPN_PROVIDER=PROTONVPN
+OPENVPN_CONFIG=mx.protonvpn.udp
+OPENVPN_USERNAME=${config.sops.placeholder.protonvpn_username}+pmp
+OPENVPN_PASSWORD=${config.sops.placeholder.protonvpn_password}
+LOCAL_NETWORK=100.64.0.0/10
+'';
+  };
+  
+  virtualisation.oci-containers.containers = {
+    torrenty = {
+      image = "docker.io/haugene/transmission-openvpn";
+      ports = [ "9091:9091" ];
+      environmentFiles = [
+        config.sops.templates."transmission.env".path
+      ];
+      volumes = [
+        "/mnt/nas0/public/Torrents:/data"
+        "/mnt/nas0/public/Movies:/Movies"
+        "/mnt/nas0/public/Anime:/Anime"
+        "/mnt/nas0/public/AnimeMovies:/AnimeMovies"
+        "/mnt/nas0/public/Shows:/Shows"
+        "config:/config"
+      ];
+      extraOptions = [
+        "--privileged"
+      ];
+      autoStart = true;
+    };
+  };
+}
--- a/secrets/default.yaml
+++ b/secrets/default.yaml
@ -1,6 +1,9 @@
 #ENC[AES256_GCM,data:L8kvdjZ9X/02Eg==,iv:ogyrJgDGw2Y/++iSKiTPHRP24WP4uOSrl6i/4NR29VA=,tag:4B27juuNHO+IEbFwlqENOQ==,type:comment]
 tailscale_auth_key: ENC[AES256_GCM,data:A6K9AvhzJjuwundx5WijfVMBQbzhq2t3R/ZiEx9HaSe29611COdHkv5Y1BU1nfkK2R8tmI2I90ZZw+hIjQ==,iv:nKORqod3K8v/yAJuQCvZPzjarQrKtQhKsO06x3xy9+I=,tag:CcdLp/E537AI43KxOsg1Yw==,type:str]
 smb_credentials: ENC[AES256_GCM,data:O/e3JChdO3msxD6kS1D3l0W2hfA4/3mFtYFC1MinfUAcGUcYM920MA==,iv:Xru9Ige4/gRvJ2LWqCvnuBCnZf+E+Xu3Ba5f2eeoXzk=,tag:0+1CaTUf0Z4mXZTYbCjNpA==,type:str]
+protonvpn_username: ENC[AES256_GCM,data:OnIswOUfNABpxjyQ3uqyWw==,iv:NFG5t19hx3W/rUD+5mPQxHjzCGay4nAZbDLFZ91CqbQ=,tag:Z/usxpL1TfKx8ox3gGMIJg==,type:str]
+protonvpn_password: ENC[AES256_GCM,data:uxd3G+I+vv5q1lENJ03o6cmx+B7aIDIP68crI2eTKsg=,iv:5wZuFe451M9jtZyuXZh+vm/RdiAoHy5dwgx05d5BxRQ=,tag:fDgeymPuKiw66w9esGI6kA==,type:str]
+protonvpn_ovpn: ENC[AES256_GCM,data:fHyS3PXWVqyqIXaz93Di0W17C7P1Ggh3iADXiUk2CUzyhIKzMPTjgBhhWN8kIIMHIJrUDMiUs/G2UY2SFSI+SC7Eub/vso77BLbTs5SOHAU/lp9lDu158HpnnhEnKg4J8uEw2Qo7N6tF18IDrD5X7E8RZxwjDreVpKL4il4e1i+6Cw/33LPcY565ukvhoVeoCZJU/sZPJ33mtonVLmBW7qGhFWKDDxlmIWdotdrALye9op6CiGXLCqAAn374xS55PjAaT7cpBkvzJBDXKTfWTfysbUEURWXOHg7WVy6HDjEowQWUdVOkfh9kQOVTt3M9dI275HdBDfoDpF+tUTlEmzoyE9PRvYYPPgtvqJ8Kvx7Ml5h/oFoYCLnFeSuPJbRQH88usUCep/cIIItjAXRBqhBOUbw7uyJ8+U7QymG1FKIseEeFcm3wlCyBz7k3qSypuNf3dPH4dWUCirfm/gv0XlvGlvchpnuHm0MZP1+WezWOTJGdbhL7J7e+idrNFO5zJCLBgV4oKWEN041o0uMhIW0SMGU7ZSOYdNEwMKhE8PfzJhpgFLLAtcvwLhnrY3bi3+Z+Aw1utormgATBp+PPgY0U4+hgEJqcJz6c3jyVhAuo40yfdj3xcrEYcMlgDkFKCTEyHWdYQZ0TLH3+l2k79ThW5FhDDuxnMRcSWj7KJTNpPzT0v3OMSPhwSKRa5232iItV/dqCoZOFCN5hpw8Lf/W+yx/nUHXjWT37Kv6WsvBV+D8o6bN7DE0VuP8q6fsmmKw4AK5H0g7wbXVsOvD6g103FpHISWEI7beJT93xmSulT/dgSo5pBFqUWX2XCYgA7MeYxNihII+gN1XYYNUGakV5giNArUIwWQLqGoIqbHN72+0/Hb7gIdN74PKmrfX1vndnYBwI18gn0AvKuyEaGYr2CB5kgorVLOiZT6426wuq82lATfFMwNEj7OAfKpDKEzpZfUXD7WdppYLcKWKY5HOE3hNUyEQOo4L1xa98be55B6oRZW3T6bOqa5oLkfTFUofh0oC64F9IvlwN1XEKqr3igPi3z9V4F+Y2Zo5tS95ju7CtkiNGshT/NLNhO3gn4gbvnS/vycMZvmiyT6NAzFcdDLLM2+AoCDdmHHy1mOaeOQUhD81cf9wbywwRaTsS+xxu7KgSibY+MraBNdtf2kBtkQcfjlnT8xG0iRLQujXSfrweFXhPoxJBRLTHVWv3mIWHqXswyKfhpYZLsby5tlbWYmBtaVq2QzJ+pxLclz1D07/VCTHFJdKQIS/gvewoT6KZe4sQ1CKEN/40J3139qqqyln8UI+gTTbpnZC/03B7zbWfX82oMxY1pPzsYzsBZr0JIWVICT4fhrfbcp2iv2YR3n//3zmXC153Taa2IpN2H8w/Eqrl66/8uohzjuCRwXX5I1HdstO4wRJsfF6GXk5gC2m2gKRpIdtb9awcruxlGkexb8fV22SRTuWEctGCvkS8RowXrMWd18P6kdO/qRqSkyCSwbJtxOOVH4MdStS08a7R0IYh/V2UTX2FsDyb+MGVzPTcXWtE39o0u6+/Hl9rB2mS20JqxghT2GcsalVQSGmMguBuMAtKVicQjm5z87vAERJtBQVkc8HXIZL6BIatQB0pKoyYbJ2oimOBu4XbicMOVXlK9Ts7XAVPA9bg1slqUWRtpyNjrEy8XDVthklJV+Qyii+bDyTYGA9KKt/Oh7vh0/GPKATASyveCY44x72kh3Bs83/NVNvPcgzRSy5HjM4xwdNV5JiticKuDPDnaLJWCrnXqctQxaZ0Fd9nApUzVlUMHndfiiOQsmqxENpFT3sc7Hh1srsHZHWd/wDg4rDAYMCIKrYhg8aDMNzhq9Lqpt8nPU8xtpLSp7LSuVHu+kWoaA99FOtVL7isTNhUbfTUAIWZjzT4Ipad6x5gu4LWhXh6fs3/RDq/6vAhUHV59Q6f3ECa2Px7xwH5unBbyUWTw5ppfrZxuXkxVGI9oqCDZJ3IXqaFsM+4SA/Gc70RaRKgFaYSXp2NLpo4ujDfS+czqzyA1TiPdQIESCCykfqHU+cZ5dTjcnS6/vJTnop9po8ibrUzuwNl8wpRE5rGNjmHWhR3OQpcKGTSGH3FDJuVxZ/7RQZCpC2n7KnpmdNXyfMNone2x7hUzazbj7YdsUCq8NyqZcM0toVP3rY4+Pj5BKvG7KHHtWKLIOdcMCwXwuNQLTKYRxJmXN6znArxvQePdO+Jubps++7WNx4MBusEFZu/76L+NXBQVLFIcjmn4aNsaFneGOZUjNxhQU4xeVftW64BDgI06J2xnGZPArZXtuTiFeh4rTSpqOpFOEESKumDuYQG/P+37bnPFbE7uSM5MMtlm8mE5cSY9cNXoXTYV/bKVTg7HZwnIypd5HDMvhmjaJmT148ODe795fuO0GYXKHg5XzjivbP8GBRbVlOKtrfEeJR2jOK7SYxH26OyFC+R5iYPM9KnSQRXLNs3592SztlROaQ9p49zbkY4ArjtslX19ejcS3sSHa2tHF62HG/eN0/0FmlpUV3xM1WUmrA6V6oCvrvoQ+5ORN0be5CDS9TkIFAT6xJ1XRzpRzlyCxKYGR24hRZC5wE3vKuWYLFjR5a7mKMISVQI+EKN1GzFhgLyLwo+pdGAYwlBQyJwFXZwGJNnbHVJ2j48iiKQ0X3Ik8uMyOhMwWH1hes1vxuoT6F16dkxVY7vX/2QqH1TGWgQA/YnTN3cyDsPdFeEyhnwGdOahPmeq6Gr7AmaqyYIqapNVqBR0eeAbO0W89VRz7O7sYCozQaAgQFKXKfqdCZpTFkkQutmYb3tXOUsecuV2M7zGJ461SGVzvLwztIz5xekum1nX9WXOuYsR9S5O9RitmfhsLLDurFUWqfOElunkUmn8oW05HsTmjW1ghWSMY0UqCK+rJxIbf5CkgVSbjUZ16vp1+8sBk8KoB/zeH8ZgZPJSf7r4agjjxt54srX/B5DV5aX9XsNkAzCBKt6TiIuSb0SntlEq/AHyIrXAmyEcrBqKrpDlb2q5A1AfFObXMFaKooTNYcmyREt+BSji931wE+OY0Sqny6JeglwC0xBS/OzQGTvgx5Wx0Y0R989R7cgf10qQTzf4Ur+X94OYoBLzx1gIz0CiIKtM48UDHLNT4viVRr4vncUedOlXC4crLjhBB2Ecwr/i6SksO7OMwk4bojmUKpCgDPHxP92D13bqkkwA/o1yvgtJQu0HNYzzBHGdH+jcKPQ0EVKPdvB4Xh0B+FWdhpgNyQMd8+El34HvehLjl4ewo/NPghROtCwyi0i/cEU7WKq5JVi/HhaV0zPZMVo13bkdLhbStTWweWQLyRCgi1OQoKowVCvN8Sa9I6Ooju7+SQafPmNLyXPHmnsiG28yeeBpRbWixR89K95QX3FdMbWBBFfdDO5D2QjDxfRTywsdUXgvYU/f/S0Nv0XtZZK+2YZStEPOnSAAXxhUPxtArlmgNo2/TNrxlLfNupF+TqInHqfuGEQrVgksOVShCoIqPjfcrKcrWHAM+RqjbSFXZzC7KCFEBjipPU5T8AfRaTJk7O2YM41lpUcq4Hfclsg5gkaUbBBqF+NcV9+8YaxsTRU0Gea9ve4mdCwAyudYDxFl3XW5nooFCKDLchXIfmyTL4gK2Ml8c1TjBNZS3qQCCQVblV/RclJin8nIXznmf+wdhnH+zf/6BShdHgsMQlpjXywSMiwlI6k0Z7merN4Qyu0lQ1Iv8f2O/h1HMOx8WrpQGP8VXnH/zuWDob2raLu2mnm/87MFCyemnqGak6XpDfrxFS7d3T5aFH1dgIvGOkzL7qqqFidlyi5shvCCsFlsl4suWSndrxkoXdw/fqIfWc2lhx5sSOvyNJ84NrTM6BPDtGG1B/xLSEl4BxpuPZ8mNM2vBoGTSFZ0orNRdBixYYHN1Io8jBo7oiRTDReXxwhllp9KY/ngvUc5EcLEOSuaAV1h+egn1PWdgmiNDNMYsozId8EbMnsFlmd4XqlYV1jvkCmj245TO3J2qWDzT/Jx7cQIlRDSDdkJPrnyWPYgNTdQTrPT8taXVmapy5pOR7+xbfSKMa12FcAl7UCweRGbqTMpfhGzaik0MNv1XF+Cw==,iv:1BHP9M+Ao0KQyv3RcZlMIo4Fy2JkuaiRVOAPfypT8/Q=,tag:akYRVsbt0wlgt7fQakmCCw==,type:str]
 sops:
    kms: []
    gcp_kms: []
@ -10,221 +13,230 @@ sops:
        - recipient: age1lq5q5g5qjsdcc3key0n6qytkc9z3qx3d3e96ap9zre2aqgvc9ujq82l9hd
          enc: |
            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBFUkxiTkplTTZQeEZyWGZ5
-            eklyUXhDVW8wM0o2a2tFSldmaFFFOG9ZeUZjCmxzQUhDVlNLRTk1cUVIa3U4KzI0
-            UExGT2JwWkxoK1NzRjUwUGsyUnRjYTQKLS0tIFhqZnNIVnVCMi9hZ2F2MCtaN0p1
-            dFJlWElleXhmNTI4S1ljOCthNFpKWXMKBp8E3Hrc70mQJTYBYgqHd6dfSGhXZfeI
-            s00g/0wAtY9gsMid14f2kur4udwgnD6VYQ/pbyw0bIObMrWWYA5D+g==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBzejcrSWJadTU3SURoeTFT
+            a2swZW1QbURZczZmdDAyTVBBdVRwU2dDeGpZCis0amhTWW16cHYzWGNQQkpZb0FS
+            MGZha05JUk53SW93ZWxGMWJISUJtU2cKLS0tIDB2M2tQK0pyMncrYlJhZ25hMnFw
+            WTNtNGxJL0g1OHZwZTFnemVMc1NBTU0KidGC45FDkvkWztKexepQs2LaGgZeOS0h
+            qCBRUnwnL8GEljLNqek0A/DMRVssesahCUS10U2e3vo2deU5JlT/qQ==
            -----END AGE ENCRYPTED FILE-----
        - recipient: age1p0f62dwatt558sf5s4equdqwtg5m7lsnaytrf3xjnvmx3e0lqu4svtugyp
          enc: |
            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSArQXVrdUJRdk9sL0NqRmdj
-            ZXNvU0J2N2R3U2xtTXJRenlCNFhFQkxrVzFNCjBlQ2twZEc2SUZqODVSK1MyZXBt
-            RGp3OU1lZEhwcGhMeU4zMmtIN01ha00KLS0tIE5SckgzUXhMUThWd0VqQnNBU0d3
-            ZjA5ZTFMbElETSt2alNDODh2MXE0dHMKjOEdYnggDvcqE2XE0ebiWJqDt4qoEJ3d
-            /x6xe2a/0yCG02iXuhgrnCtDIWzJwB5uzylVomvTLQi2/er+bgy82Q==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBwS2tpL0xvOThmZ0phUmpH
+            QnVEWEZYMTdRbEN0aVZCVGdic2FPUWtZSnhvClAwS1dXeUY5VUVaT3loeHhXTE80
+            bitYZmtNeGdNRDVTMi9yNHA5SzdHWmcKLS0tIFI0ZzVMNUN2RTEwREEzcTVpSXZp
+            bkZTNDdveThhUnByaFFlUi9YY2tIQ2MKDg9bt26jRCSulBXzCgQDC1Ha6wD1yCTD
+            CFbVZwujIDxtkj/hgyTRtY4UgUEGI3rid1prmyA9tgEq0KEF4KPqng==
            -----END AGE ENCRYPTED FILE-----
        - recipient: age13c5wv623jxjja5mjz7fajg9qqwvypzgsfqrs4tmk7rpgyzu7aufs4ul9f9
          enc: |
            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBaa3Zsc1krTHU5VTc4ZmFa
-            NzhqZWZTQTIvelN1d09EVWtaenNCWWhpSDJJCkpBeWsrc0IyaXBIaDNQY3JhL3ht
-            SlhhMm5jblo0UWthRFVIbTJncGVVZUkKLS0tIFFhVHdIMWFrdG9iRmhvb0lMQnVC
-            bUkzZGE3NHhQYkpkTFRJSjVhRmE5L3cKyn4cRCeE3ADu+eZKxL7ou59oLJs3QVTj
-            NaDs99W4fpINR8gTpuo90bZ7CUZfX5RFc9aSjJk8XMTFtms2CMPJjw==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB5c3FBQ2ZEVXRKVFZFaWJJ
+            Q3RnTlNOMGtySDNPVDVHMk1naElsaE5LY21RCkRXdnBueERDWkp3dFpnSkRITlZ1
+            dU1ldnNPTTdYRGJuaHJ6WGQ4VCt4SkEKLS0tIFVvR2U5WGxYK3RKSTNiZEVsWkxO
+            LzBqL2pYcGZZUlZ0d2VsU0RxUFAwMXMKvx8Dq8xFdjxVcL/VM43xlQt366qbRjxH
+            PJHpBMfpTGADrlPqC/Y9phAz5PNIs79ubmamAnoSrtsiIU7LcAfOgA==
            -----END AGE ENCRYPTED FILE-----
        - recipient: age14vsmekuppm4xhp4rthhv9jjgzfv45v39a0q8dsgg6yusw0pjkvaqnr9kq8
          enc: |
            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBpNzhLaFhzQ1hvRnpHQTB6
-            d1FOMVNLTlhjLzM2U2xkbnRYS25BRmtzM1NRCkJGbzhybDV3RzhhOGVJU2dYRGZl
-            L2N2eHByY2VtQXZ6OFBZWnpEdEIzVGcKLS0tIDloaWJrM2sraElUcktNeFhLb1BU
-            dTdTSm9hN0FyZXYrS2dhV0xmNVRTWUkKUyyY0bykX43Q9je/0Jfw/zl86iK0NB6H
-            fokFJMRIfv1bBUhsdYv0q0pMNB8wtILMPFOBiDhCDROeQ5fbj9zw7w==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBTQ0R6ZzBhYWozRll6SGs3
+            UDJRU0Q1bE1TQkQ5eHJ6YjVDK2pDSXZCeDB3ClYzV2tPYzdoS0tIRms0WXo5Y3BS
+            SCtVUVVkcjdvZ09yNkg0Q05LV2dvaFEKLS0tIFljdDNkUmlyTkp0ZDRFdXhRTVlN
+            NVduSEYzK2RqTFpjMDR4S2E2L0s2RmsKq8YcS2X3xsSdCW60SyzP78SpSnDVDwVn
+            Wn4Skw0Ecmi3934QF7PfnwTBy17d6mUnGXT2axI2eZPjhrezFdnWnQ==
            -----END AGE ENCRYPTED FILE-----
        - recipient: age1kjsga2kf95lu7p5stqr5d9p87jquyypnx97cycj6jvhsm9zkn93quexx4r
          enc: |
            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBtT1daRmVTNkJoUlErQU1I
-            NHdOT0NJSlY4aDlQQzFoVDRobldKTVg4REZVCk1PZEsreGdwVk9KcjIvbkl6Y3dX
-            VTdrczhSb2xnTks4NHZrbkNkRTAzdDAKLS0tIHBWOXVOL1JURGxEeWh3MGR0djA3
-            QkxLamVmUlB1MTRUL3JOODdPY2d6Y2MKuk/sMD8g2Hbb5GWdjDeeZf/1n6Pv+mrf
-            CjVLryRgM5dwlGh/uTxOjMnk8bZ4CIprlMy/LvAR9k17kcQGCeLd0g==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBEWkZSNWlKYmdUdHczUWY3
+            cUpadkRsT1VVejNzTmZVV0Ntc2dicFJHTEI4CklWVGdCOEdxMEJnRThpbWYvRG9U
+            RFJmbVQ0cm01VElOaEJPcnV4S090SUkKLS0tIHJxYXVzQUxvamk1aFBmMm5VQ29D
+            ZTQrbVVKN0F0bENhbS9STnIzL0NYcWcKS/oK+Mpzwfv7BXsUt0EzRanIsPTFgIOD
+            sM9vVvqyttaz25HWHI1QeBuk3XmNIUnac1iElvn4HacxvI45TKYlLg==
            -----END AGE ENCRYPTED FILE-----
        - recipient: age1jc6ghxfgxe3gx53xa55azxan447cfxaqfqeh5y5yzqapj7mw7ajql8kv02
          enc: |
            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA2TlhXSnVUQnZOd3lWV3Vh
-            dnNUMGxpaW1RYWNCeHI5cDVVcXFROFA0VmpZCmVZMG1oSlBhLytwQzBZL3lkQTlz
-            OXhhenkzVVZJNEczVG5RQWw3U3BKd00KLS0tIHNyNGkrcHFuRWV5Ym5IVlpBRkp4
-            d3UvTnVZK3BoWVlXU3BvVnBQdFhLaGMKXm4ckG/2t2DJdrFFw8vxVRB4SPTZnOGZ
-            P7pwtZZtYHvih+/iUCe3FW1Ra5TUsrt1In8oxqEa6KRzvQA1UGm0hg==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBpZy9MV2w4aWxDVzIySEli
+            djM3dHJ5T09icWVDKzEyenFJRllGWXlmSzE0CnViOVAzS3ExdVFZTEM0TzJ5Y3VO
+            eGdlK28rN1d4b1NDR0luQ0RyWW85NTAKLS0tIHFaVkNxTFRnNDhsdVM3L3h5bEpB
+            eHVhc2Vmb2pVU2NDTHI0SGxvaE9wYVUKENM+QPRlVp1/jovwSKDNhkfzFue6n/IG
+            oeyTdpM3HSGjxoTTI3sDfQQ88eErkPBNq5liAzVFvnSu9ndON5uT+g==
            -----END AGE ENCRYPTED FILE-----
        - recipient: age1faccfe85637hme39xyzgmvjn6ku9c4aapfmpfc35hswj5emhnedssrg2cq
          enc: |
            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBOVXg1QU5SbnZGdmNBa3dE
-            OVdZUUhSeWtuUVpDU2xJWTF1MituY3BPRUFRCmRIOVI2QXIxOUtUQ0NWK0J3NUIz
-            SzR5Y0orRVY5Ti8rQWYySkNMSnFwajQKLS0tIDNOejd5L0JUZ3J2TXdXR2hQWk8w
-            OEtYRE5vM2FMNVBydFo2b29nQkZYdk0KG4S+AU8oMnl83JiE5KwGhDJ5Zgkaktvw
-            iVqBNBa9vwULHHNigINhU2Pt9j52leVNK0pjQOwp7R6kzEdL1k1lXw==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBxYzdIT2tuOVNxVDdEMEpE
+            d0x2aVlZNTBTOTBKblM4NHFPeWVzc2RRTkVFCnNMckdoMEY2UHdYcFZtVWJJaSt3
+            YTg2UGM2S001U25SNmt1ZDRMNW00TW8KLS0tIGpGVDNOZjFvVW05aEsrUnlPTTdo
+            OFhpWVk0NjhBWXg4QkhSVnBsQjNXVGsKkO7fO7Aa3Zw39aemSdGa7OJ5345fkftU
+            Gg/Apm2vk51Gz2SbXbv5clQDZUtUxP6PzMbSF+yG3ekxUECnjX0Qkg==
            -----END AGE ENCRYPTED FILE-----
        - recipient: age1wc3czlazkfxphsq6exxxkdpma4lrv7n3v3fvel9l5u96dlljn4fslh666p
          enc: |
            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA3OERmQWpqa3ZzTkpzd1RQ
-            VlNXWlhQQ0JYTWZhaklzMHpDajZjdmR0ZFNzCklDb2ZNQzJwZFlwM0dIZFB4RFB3
-            ZDI4YlRlLzloalkrcFdtTDJoZ2Q4SmcKLS0tIDhCd0RtdENyQzFIQ0lkQTREU3ZK
-            U0U4UjFtbkxsNU5MWFp5aGt4M3FPN2cKgaJohLT1pcnyFz//BrW0Q34oyfOzKGX9
-            Zfmhdcbp74rsAvQvLO8tofCABaAuw/Uv5+CdWj6NgIyUmzVHaEXYAg==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBVWTVSL0NFcTFvYXNqaVU4
+            ZXFyMGg1QXlrOEdNejdUdXk3dnRSUUF4ZkdnCm8rZ0FEQ0FBSnhORjRCMEFBRElU
+            NlVPZU9ENWhkRU5QMTN2Q1NvNUEzOG8KLS0tIGVrTFBieWlsMUtqb3VGTmVWM0V6
+            T0RqMWRiMnVuV09HWmhkTFRQd3pIQnMKFP8pZY4oQCgb9iZ62KlB4l0BnHopfmj2
+            DYzqIXJ1owAQmBrujbwv54Sv1Mwir4VL2joxgVziw41Pv7bpb3zRHQ==
            -----END AGE ENCRYPTED FILE-----
        - recipient: age18net4rsvyx84d9jjh64rgqsru3njwc438qt3993kn865dx9weaqq0rzkrh
          enc: |
            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBsWFZxeGVXVXVTL1dmajZI
-            N0x1QUJqNi80YnZWWEtRTlFaTUFWUDFyYURNCmhyWFNtTEVUcXZ3SUxSOVV0S2to
-            L1hPZ2RLazFZcnNtbUFMOFRGeFFGNTgKLS0tIEtnejdacVc1ZGk2UHo2SzdhMmMz
-            U21Ba1doYlBnOHNGTktzSnhuR1pwdjQK8bt6ZcGvI25zXenww5hCZm6L9itPiVon
-            N6pOJ0uCNLJROS+1QG/yYGAoddm9xBvkmMq1l3lwA3LK56adsb5iGA==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBiQTNaRFNtMEVwbGlkSWV6
+            YzU2dlpWTUFRSWJ1Z1R5akI5OVJqNUFOYWxvCnVLdVZQRUVYSXA2WHBrQVBTUzlm
+            eEhWem9hZk1WM2hPUHYwMndPaTFyaFkKLS0tIG1Ea0hRMEJxSXVkWnFzeHBJOWtO
+            c1YvS2dqSlZUb3N4S3ZoU1dRcDVxTFkK2vnq2cJapNLD1lvDJ8tcDB4UNZzAGkjW
+            fCkrT6kWJX9oZyJCygqrLe+cbr4aO/gGia+Z+VuNoSiYKEd0o8dTXg==
            -----END AGE ENCRYPTED FILE-----
        - recipient: age1mc6eyvnqt4ztmqdzt08zaher2ts37ypgzuh049v3cgv9j0rje96q5rm56k
          enc: |
            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBueG1CTnRUdlFpdnVNZGR0
-            UE5FQTUyRFhnbEtqWHBzS010UU1ld0ZYcmpjCnFaZjE5SWVRM3hid3pyai8xaFI1
-            SStLOUpDT050U05SeVlRVG1DU0o1UHcKLS0tIGZJK2ZRZUttWWlTVGFHQm1mc3Y3
-            aHgrT2pKTGVyUDNwM3VQZnk0OTBqMWcKjdEyJJBThhFosaN64Q6aAB7Bwnlx/9yy
-            7Mu5ueG6AsTAAU5nYKwsp5+lIWHiAg8sVXlrUQOW1cZ7PR/DI+h0cQ==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBKZmtlQW9MdWVJd1Zpb2RU
+            TU5nbXBHWlVtRGJsR0J0bHZtU2dQS3BjcFJJCmlodUdwc0JGcjYyRkdZMnNZUEZj
+            eGt5bWRvNUlwWEFvMG80K0IzTFBRRW8KLS0tIERZVklQc2VGRzdERzJDZVNCUVYw
+            eEdyT1VCZjFRa3ZSZzBmUzBVT1lRKzgKdC2K6m0fzU6ufVwIXu1kYpP1z9+sDK3A
+            UvFOMN+bD8e4VDuypNkiF5PLfMwUYqIPD2A4h3RcvnWVbSkDlgwszg==
            -----END AGE ENCRYPTED FILE-----
        - recipient: age1h7yp3psl5zyze8sl6lld6ksv6fcmul9z8mjwc4k78mwnys58c3ls9mgfdx
          enc: |
            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSAvVnRaV0FZUlc1UnhMdnhT
-            T1BMbGpxWHNDM2cyei9mT0d3WWpSWHVaK1M4CmNSOFJjT3FneE1kbERneitXUm1N
-            eFhqYkQreVZtQ29FdkxMTVdFNm4reEkKLS0tIGw3S3dmRUNjTnVpZXgwSnVjbnhv
-            Y0VLU3ZCcGFEbWNycVl5Y2cxU3hsdXMKmNytNjac2AZiIqBMuBShlCYvBxxwBful
-            xoOj4IXA/JzJ6ko/mYRnMcKntD5AmIDgpzrbtOdD7hoXffBMyQJeWg==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBRSUxJTlFESXJJZFRJMkFZ
+            SGVPUHNKREF5TXpNeXdOT0dZbG5IWnVJUWw0CnlNSW9pRG13TFpScTlaSEc0S0pC
+            RlNVL3N2cU4wMnF1M1g4SWE3TmJRVEUKLS0tIDRiYVBpeGQwRVhtazFhYmMvTjBD
+            QmJUMzh6WEY4eFVGQ0M0dVhtT2JMdU0K+PDoBQS2qqpIFudMLF6Z8ogHUWmJEPpr
+            7ltDsDwjB6zMd8s0135k6prghA47DaMZBrwhFcQN4MM61U7dRGmg/A==
            -----END AGE ENCRYPTED FILE-----
        - recipient: age1qy9tvzlgek7fq4nl52e05ad6pyvglrtaxwjet9gr0fzq85z7cv9s6uxzkt
          enc: |
            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBCbWp0aFgrWXZyQlErQzdT
-            OUt6YmN1QWVYRDN1Q1Y3bUxKWFpxeGVtVVc4CjJUeUI2YkRoU2xGVUZvTThva3ZM
-            eGpFdG12bWRwOFJrMmZKazhMMHpwRlEKLS0tIGsvZG5SSThpaDB3QUNtSE11ZmxF
-            aU8yU2pMVSthTUEyQmNLY0t4c3pqYVkKcjoYhYEQyCJtCLxI7I9qy0TmDXVtj9MC
-            VhS5jxqtRUMZoUIjrChLMEj8AE+ITQasfmARFcPA2kxEUzdbjaGzog==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB4RzJnUC9FaDFUeVRzSk53
+            M2ZkZzgvZXZQYnJxUjM2RUZyZDJrcVE5MWd3CnlCRUtuTmZWTlNkYXVhVkorUUVv
+            WGNQMURxNWVLUGlhT2lzcmEwWXRkMHMKLS0tIFZ4NStFR1dpZnQxaWpsNXR6QUJI
+            NWhsWjlITkdFN0c3VGErNmZJVWVINGMKNW9xdpWJXesLqZ+BDTXq9OIr1ClF2fgm
+            mu4yOKmC7LXb7KJn+mclFvJb0VOpZ2FFDKzIfMfVDKElfmowL6HjvQ==
            -----END AGE ENCRYPTED FILE-----
        - recipient: age1kh4c0dmn809xzcf7ntpjm26h2xh4ljaq09r9n5s0tsjjpr55ff3qqmkuca
          enc: |
            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBoUnliOXFDa09UZVNvNDkw
-            RVovdEIxMEYxV3l6MWh2UXFBenh0QzRqTml3Cm0rT2hQS001RUErOGVNTitDY2tD
-            Z3BiQVR5R0N3SDgvMFk0Z0pOQVk5OUEKLS0tIFZZNDlRSUJGd2JIVUlkazVaeE5u
-            a0lCMVV0b3hCb2tVMU5hT21Yekw4V3MKVaQjkezytN8PqQtLxFwZCa8RNtH5uVrH
-            099CK1tVurK7wWq/cLNqkNB/W03YgVeOM9JLDIcJy81XUQ5ih4O5fw==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB2cXJ0SDRISGt6QXBhNXFm
+            YzdnWTRWK1VuNDJOZkJDaGdRNzV6S1ZSUGxBCmg4aWFSVXlzVkpxN2R0cjFndThC
+            YWZwaTFHUk9WRy9yMnFKUVpSSVVvTEUKLS0tIDl0TFNNOUMrT0VXQ0UwUVQrdTFx
+            YXZCaVRGL1cyeFk4eks0SHgyUTBJMlEKXSWQuX7UqsuauMUqxfDpWI7GRk9y5ixm
+            R8SETOzNqGYoQgw8O3YtnJ1soiVqaHE1QjzTz7RvoHVRO4B4ys5O1A==
            -----END AGE ENCRYPTED FILE-----
        - recipient: age1h9ty40uxgznh7s2d7l3cx74lkylpgvs8lknkvkjvqyy5kn5kfc8qz0zc4c
          enc: |
            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBZTW42ckdERnY5N2VRU2pZ
-            TEI5M3lBbnpNOVFzeFptR05rWDlUMkJPaGswCkJ2V3hLNHJmeFkvbFkwZVJUa0Yy
-            bHBvS1IrdCtpYWF4Q0pGZElBdUNRL1kKLS0tICtDSlphanltS3ZwM2ZISEdIVW1K
-            c2pBL1FkRE44TjhMZEpCWG9XYjFQOEUKRGlsjnE4rJcOGpRLix6nxCXk7VHrx2vE
-            yYFu3NXFZsJ7Pts7g4EdvVFrLSqs+o3+2N47eBpDQHIjmN2Zkwde7w==
-            -----END AGE ENCRYPTED FILE-----
-        - recipient: age18xjdme8vc657l8n7fzpn7twshprmtpc8p6usn257ajw0vftd8p8qxwwywn
-          enc: |
-            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBIZEFodXBiYXdZbFJSYTY4
-            VFZRbmFoZ0xuc0RiNURIOWZXVXhHYWZtZ2t3Cm9Od0k4Z05wRzc2b1hoYWh0UnBZ
-            VnB6cy9oZXZtNkY4UEZQaXQvL3FhWlEKLS0tIHNWTDZZbXlUb2JMS2NtVFZta1U1
-            ZjR1QTNvcFh1UDdwSmJtWEtEVmszb1UKeAmP2Bt9+/yPuFUJm/LFRjB3x9ESIpui
-            xM0xqmzt6Vxmh6jTYo2oeJIIk0by5e00cNQN7V3btk4nIhqHmH+sDg==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBKT1FPeTZyRnY3bnRvWHlW
+            QnU1ZXpKVlo2MWZUQTMySkNqRUlXSGIvR2dvCndtMmFiZTkyZDhWYW5aV05YblNv
+            Z1BwKzFPZGk1QSt1VHZPM2FoRGZzR2MKLS0tIHN2S0pTYXc4dGJQbDl2dVJyaW93
+            MTQxTldaQUtNS2laMnU1NkdQWWN0YjgK7fi9o4eupsvitds6NeDBy3ZSNOs2AW51
+            L7QgEzkQ7mq9bm2UiNglXpGO55L3cU/fc6ayapZ2zxfQrzWvZaSkDQ==
            -----END AGE ENCRYPTED FILE-----
        - recipient: age12f24j7fcq46cjuqjftv5pyffpunyhqj98ypqf729z89xzunzryts5d8kl0
          enc: |
            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB1alBNWG8vQWZyUTBWVXZ2
-            Y3RBY0NRU0t0MWppMkhuRllHV2VwbndPM1hZCk5QWkIxU2VxdzNvRWJNVmZtMU91
-            U3lIMDZpL1paYlNwUG40MmNtS0t6aU0KLS0tIHhicjN5czdwcG9tSGFObFlvMXEz
-            a2wwQXVXZUhpbGU4NDhSVll4MDh2NWcKxlc1+ZSsjj9Zpn5Xs1cu3oHlPlKrlRDT
-            Nn85NByqb2IXNyZLL4GqUmf3F6PlDHsKT3nebUsZK2F2q+cUSV68yg==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBicDR2UkpPclJyUHVUQmRD
+            S051OHFGbHhkL1BFaG01UTd3YzVvR3JlY0RrCjcwUVhVb0h6bFR4MUh5dldHUDM2
+            ckdTcG5KMnFFK04rZzJJWHR4ZExKaVUKLS0tIGJQbDZNSjBiaDkrNC8xT3QwNFpF
+            SHBFbTdDVDI2aDNWMCttbnpsaFBJckkKDpntBW51DoJigqUshBgxlzTEsDdhIdHa
+            7YtwzakhqZxnMbSjRjU9JddX4lJ9wcgigcrT45e0w/F/bhspicAQ+w==
            -----END AGE ENCRYPTED FILE-----
        - recipient: age1jc4a52cukf6d94tt2meq8tnt084rhtdd93hwzjhzecc70rmvvapqtdng8v
          enc: |
            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBpSFQ3SU9FZC9na0pGN3lO
-            eXNPREU0RUN6N0hqNmx6ME56aDVHRVZyeUZzCmNRQXRkWmVGaDZhcUhJSE82M2ZE
-            YWtVaTlEUk1QR2xtYjZTUUw2SW9XbEUKLS0tIDVobFNJUDBYbDFvT0hTdUtXbmRF
-            bmpYTFh0cXd3ZnhDd1RXVkgzZkY3a1EKQhBjMQWzOMsMOMRX/var2gXv43Wp9gzu
-            gmj8kcZx7mxH9+aXr54XwQ7HDXCoYfio/xwbnCmRjilYye72VCbjpA==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBQcVRyWFBVL2tpMWNORTFm
+            clB5NG1ySUloMEdtRExpU09oN2dvVkRUZ2pjCnorNlBET29hU2g3UmJLV1J6ZXJ0
+            MUx4Ymhad2ViSVQvazNwY2l5TGorVG8KLS0tIGk0VTVqTUdua2NvTTcyTk5YK0xu
+            ZUsrVk9tVThyeXNSYXVuQnM1Z1FvRWMKBdoaGl8ng6PgxquWAz9ag09JkL2aiPoF
+            y+oUZ0RvC3gdjKXRVYQ6/Blf5EkXK4L2qa86ZCLLFVUlzO6zIzUZEQ==
            -----END AGE ENCRYPTED FILE-----
        - recipient: age1s4hzwj982zk04kr7c5u0vlemkzalv72wtkttkgzt64xv8a4r25zqxra6u0
          enc: |
            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBGQmx1ZnNLUHVYWEVZQjBm
-            UkMxSnpoWmZSZ3VDZUZLWDN4NTRkbWtjTW1rCmhRZEJwK1ZTaTE1cE45NzBHMkpC
-            MUpsTUNXYXVHY0h2V3gxNE1qNUwxYUEKLS0tIDNuV2hvbEo1QkRacGpKMTJ1M3pm
-            QTdFYmMwTmtQR0x3RnAxMDVoWWdqb1kKs/Qw22vK0vAKprB29SDY9ByQTLOGe27I
-            +hwoz2HsqSuQWVocWWea6jprxtewXfHuPyGi4HreyEMIkYBWwg8M2w==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBiTHdRcFNzZDBZSG9CSk1q
+            ODNYVkw5VEpFYTFabm5IbVcveXdQU0VFVTJvCk54UkkxN2lxSU1hbjRxSCtpYjNx
+            ZVl2NWVvaFNLakdSZkM1QzJGYzdKZEkKLS0tIHJ2dzYyejUvVzdZNlFWeGNwVmNM
+            QXR4NXZWYU43NFBUdzVIVVE4Zmh1WWsK3oduau1PBPbSYW3uYoBbx4y2QldmlwYS
+            lmPFEyykDI/3W37Z0b/+0bUIZd2FV0b6faQGkKMjnsoDdTuidXISEQ==
            -----END AGE ENCRYPTED FILE-----
        - recipient: age14cnx8ttzqndcsdz4xvmx07cvms6val5aanrf9qsg4j888hudufxqz9nm5p
          enc: |
            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBSMTRDSkM2Q0U5MHVEZFZW
-            d1RGZmpXeUxvS2ZnY1loOGF5WXZJaHllaGdBCitBT01sVENseURDRGVCZVptcUY4
-            TGdiWm02c0w5U3lDWXZNbklwNFdEb0EKLS0tIEd2ODVhR2VwdG1MS3h0eGRrQlZR
-            NG1Xd0I5eTZocFh5bnVSTmc4SlIzUUEKvvSvT3vr5ynBVfKCNIcLJ1T0OcPkyAUJ
-            HlWvGuZX/4YOTvccl2viUj6Te5LStTSlMt3G0OmTBkHa/IrOoetjMg==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB6NlR5L1NSSXZmVy8wMjBq
+            WmNTaUlBcDN0dVQ5b3k3M1ZlVDVTbDBKM1hjCndyb0xLNjBSK1VvaHdHN1dGYldX
+            bUVQQWFwVk1Vd3hoMDNqaExGUVZ0SVEKLS0tIHRYRTd3TjJHWTc1R1dwMDJMRU11
+            T2E5NnZQLzY2aXgwcXYybFZHZUtWMmcK8RJOq+i+0rFFFxJyZgQLytVSzQ/ynlkL
+            z30fN02CmfMivh1qF8knsfsRW9sBAwoOHLBZZB9oSjgheukGmXuKfA==
            -----END AGE ENCRYPTED FILE-----
        - recipient: age1cc80558u3f8pdwrmhev8264c0h9dkkm59sy40j7zms97qzxg0ffqza9en0
          enc: |
            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBUOWlsS3Q5aXloSmJNUGFj
-            d0RLOVhPd0hhWmlIT0JDNnROaHFtV2dTbTNBCk00dGRPNTVvelNPMmJkUnJhdS8v
-            S21ZU0szRmIvamRIU01SUEZCYUJkWG8KLS0tIHZQU1FvMkw0MHV6UDBFcmRlUEJx
-            QjI5d0NMSHhrbm9LVGZyV0dFZWJGaWsKyhm7eDf667wyRhD9ZW3W2M6wbyUfyQ1F
-            BF7yVdGBbZ4XMY4GCK8laBCoCWShDIQZW7PXYd8NxNr71sKlX44jCA==
-            -----END AGE ENCRYPTED FILE-----
-        - recipient: age198c9udn09u87zje4ctz4j8d2k5ey5kvgl34nfn573e9csx9mcs3q7a6q2u
-          enc: |
-            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA5dWxWMzVyYXFuK0lYNXNU
-            czhiU3E0czcxbGQ0ZUgwTUhPRkRVTkNKUkMwCkhDTXFtd3NBY3pQNDMvSTIvS1V5
-            VittbUwxTWRDbE01OXRvRUlSdTJBZXcKLS0tIGlRZHJpKzNaVGNGRlZyeHFtZDht
-            WDQra0hVdXAzVDJ3ZGhuWkN2bXhZbzgKRtdnbEhlJSULCB3Wj2xeyrEr6Zb3QnBH
-            ux1RL0FhOStbz/hgvTDw09OcPSbyP6O1mae2Y2X/fgz9FIIdAvZ0Vg==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBYMW5ySHJFaVA4TFVpcE9X
+            Z0xMQjN6RzgxOFhCUUQvOGc3T3VnNkVEd3g4CkV2MUFLQUQyK1F2YmdkdWJYSVZ3
+            TWR0eFJJenp5b0FiU2cyOThFQXpjd28KLS0tIFlKQ0RLWTVpWFV5bmpWcnl1MzBC
+            bCt2UTM0TnJmbWFOMHV5ZEFkdlJDNFUK4LK0SG+luzE2wBjGyrGBbfIEhq7t0LAd
+            CLAgIPra/UdZ+Lx+6SCl63hLngqp6cGfczlephBpEiAhoexIMXcvXA==
            -----END AGE ENCRYPTED FILE-----
        - recipient: age1nsuxsnf64mcfgnggy5ehuqk3egp0rea3ldzst0f66full7ap7ews5eg46s
          enc: |
            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA3RGtJMEo0clVmMVV0Vk4z
-            UVRNaUVUeEkwSkZVOTFDTzk4ejhnYzQ0SWprCkQyM21rcTZqcld2UlliZUxQK3dR
-            YXZaRGdiRzNvRThxQW43WUUrdlZ3SGMKLS0tIDQraHVtd0MzWVJXNWNNK28vSVhp
-            V2xRWk9VSzA3Z1R6SHJPSmpCMzJ2eDQKYw2Ef4JVrDHPB9A8T8y4SR/6+hqO4heU
-            YFxI+EmSLvDo/DG/169nbcM4L2bT2qOwPhNfxvlVAhCHUuxIt5gI0g==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBkQ1p4aUZKVWE2bkF0UExh
+            ZHVLc2xZSkVSdW8zRGI5eFBpNGQrLyttZ3g4CjVrUkpLamVSKzNSQ2JXQlVEZHI0
+            U3c2bmNCeU9icUpLU0ptUlI5c2NhS1EKLS0tIEpaaVdsWWtRUWF6cDlHcHNKVUlW
+            VVpvOTRVY09pZlZwOE01SmxRdHg5ZjgKu5iy2+DH4NwPs1wSzSKt823kFMQW/zR+
+            8iRUr/mQy5qFXpAqLY2fmwa1ZKL06siIwiqVO7aYZjgmb+XbOz2EBA==
            -----END AGE ENCRYPTED FILE-----
        - recipient: age13xddcc3njv29sxzfdx2rjctaejhsxr5rephruga7vjrvjclcapuqnwx52t
          enc: |
            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBGd0VtbWRiOXJBTER6Wm40
-            TndKOUtvZGYzZ2JDYktDcGI5RVl5WnBtT2hBCjc2YzZna0ZDa1pDbklyUW85dm9U
-            OUJ4VVB1aXF3TGo5UVNKcU5KSUtJTzgKLS0tIFhPREI1OFpBdXBuUnloZVB6S25M
-            MlR6ZlpaanQ0dlZrbHJSZlcxSzRhaEUKKDqR/Qn1hXCi0cKLiZyg0SIpQF4w0FFv
-            ygK84/GuAoF5aN69LLsyWEzbHGr5JPDTDE0bag7iYujqXHbrj+kB0g==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBjRzVMc3BiL1ErOGN4OHlX
+            UHFaK1IrVXlQaWtZNW1aUXBkZytqVVFLT1RBClhCblVmclBjYTBjR0RwaElta2tn
+            ZGcvSVhnT3dTNFFGVmU0TFc5S2dqTnMKLS0tIDJWRTEwTmxKQlVWVXdZZlliUElQ
+            bFV5c3ZNQ0lZTFU1bHJZQXNEUnRRVGMKzkPPx0wI51fW4jRHqQcJhK2BxnA/XhNb
+            EazwvOLaGw8qmjGVsxgPd9uYIDwDFvXa014eWOTWAGY2POb6BbYW9A==
            -----END AGE ENCRYPTED FILE-----
        - recipient: age16jzuvkchnm53wfl4q0yg93zmg7jmj6rpud79sa6wuljved74hd6qvlw66w
          enc: |
            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBjd2dFTmh2aklUT0V0Rm93
-            ME12NTVVVE94S0dpYUVyc29pWXBhZUVOb2gwClhmbjQyblJyem9PSkp6eEdkSm4x
-            UldPWW0vMUZTVDRFVGVxV2tBa1BmRFEKLS0tIDV0TGtKVUlPUFpGUnRTUGRCMk9z
-            eVA2eitrZUh0blFjTmt2YVFoQVgzbGsKZL8hF3wMu7g9Jwzi7T0gecRWH1xgbdn1
-            UlC4BX9GEb8/IDIhkC/Vei/pvGxDzChlRcnDaWrjdnWg85waZry/Nw==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB2WTdsc1lnQVNXVXNEQUVC
+            VEViVm1NU01COWJrbkJkMWR5Y05HanhrZEVnCnVNNjZtMEVEM1VmRC9yVURMSWlk
+            M2FWTnhxanNGZU5qaFJlOEVENkpTdnMKLS0tIEU5MmtsUUlZVmlhbis3KzJEaWdv
+            OWtXakZmWlJld2xsWWUwZ2hQS3BHVGcKkklWU5PYNSQNPmId6yGB/RLGtC4b4U6k
+            qlB+TR4x09N6wnQSwvZs/jcrwe1vee4Um8pCKYGgfZ2vRPDO8J1caA==
            -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2024-11-13T18:55:18Z"
-    mac: ENC[AES256_GCM,data:OHb3aHxUOap6fRDuuzHvhJdtI6wGvAhXOBE6JAeVLyUBFMbl6MD9EiqQg+zOIbLR//mP1kPqF/hBM9RAdk2MC0aBEObWAoMYfpaDjoAXnzORt53CKaxFfWR98PYA6RMemXYQ6zRygRs5dNAQ19TThSCmYKBElWfIIHwxe5YADe0=,iv:rR40yETA9vMVx+d4ikrl+AW1Bw2/kifSw8b96B8Qzdw=,tag:kemWOq4YiniAerPXkYaj4Q==,type:str]
+        - recipient: age198c9udn09u87zje4ctz4j8d2k5ey5kvgl34nfn573e9csx9mcs3q7a6q2u
+          enc: |
+            -----BEGIN AGE ENCRYPTED FILE-----
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBmM3dGL3RGamVzc211bWJt
+            YkpxdlVDQk9Gc1ZScm9BQXlVZDd6S2NYam5jClJ6cHZ1ZUxtSzZpVE1MakJjOEJL
+            a0RMWkZSTWdGUVErdGNtMmgxVEJtblUKLS0tIHFJSnZRaDc5dGVpVzFiNW96L084
+            dnVhTmh5K0Y3ZjRMK3hPVUE0WTh4OEkKPbQA+3DYyjgWDt8Y6UtaSAgys4zorN0V
+            Oe/VYsHP7WSwvcqG5l73QTj+TGHlf9/dAj/ne6ySzMnC5dtcBjoJJw==
+            -----END AGE ENCRYPTED FILE-----
+        - recipient: age1d6uwrdv48q7hx0nthzxwz2vw3j47eawwkya7cp6sd4fwmhu84fcqa77rtr
+          enc: |
+            -----BEGIN AGE ENCRYPTED FILE-----
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBiaUFMYzNZczhWQzFDcGFq
+            TnlMQ1Y5MUczV25OUDR3ckUxcUQ3SkVjV1c4CnJqMWdlL1Rocmk2NzRzbklZbzd6
+            eVNqNTNvckR4NnhJM3RHdU9qNHdId00KLS0tIEpLUDVDTHQxQlplVERBSC9vaFB4
+            dkhGejdKN1hvcFA1cFliREVvOHVPU3cKOaOwD+3Ize5PuyRg/HBvgw/kj2hpsKzc
+            OEB7RvNc/Pxi23caA2watncDtivc3oA3yelWTlDHur9vgmheKLXfFw==
+            -----END AGE ENCRYPTED FILE-----
+        - recipient: age1y8mjr0q04zy9qj8vvx6f9lcpptg6fenvw7mtdlyw6glnpyack95qcfxada
+          enc: |
+            -----BEGIN AGE ENCRYPTED FILE-----
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBOM2tEM1BWTUswakZmSkZ1
+            RVNINTJzSllnN3BER2lqYitCYTVJaTlNODJRCjIyUjVDQTBscjFVRk04Uk1Sc010
+            ZUZuSTNYdUd1dWNza0VmWSt2STJPaTQKLS0tIEM1aEprSkdiMWUyOXBKVERMelBI
+            aWVGOVV4enJEcE1nWXowbDB5N3NFeFkKQ9uXF/M08W6PzT+QBs3AoTzd8LckN2ep
+            ITY4xWzAoXemVKgzYR5S/9kzlTjpjq5Mft/wbEc3fpAkQfZI6XBAbg==
+            -----END AGE ENCRYPTED FILE-----
+    lastmodified: "2024-12-22T07:59:01Z"
+    mac: ENC[AES256_GCM,data:t8rupQeZ3b0ro1wlnlywCAPTMHgx0o53kKhHxZ3sxENtwF079xmXy1rPLUAeHL2TzxWbIuNM8s/qo1lweR3BONJ4NkTJ7twSiZCTACiSJzs35Esadjidgn7B6Th4ADYxBiaMXo8gbh24TLTb6O/szwt8K+awu5HgjXOWeVthUwA=,iv:ewCP/LxI+qvwodZ9R1054VSmYCgEjCSAT8CaUvO+SZg=,tag:9RplYsnwfsfWJ7tizthCDw==,type:str]
    pgp: []
    unencrypted_suffix: _unencrypted
-    version: 3.9.1
+    version: 3.9.2