Merge branch 'collabora' into 'main'

Collabora See merge request nounous/nixos!28
2026-02-11 15:21:58 +01:00 · 2026-02-11 15:21:58 +01:00 · f2aeee6fd5
parent fb6d0bcb56 90dacd4f06
commit f2aeee6fd5
40 changed files with 471 additions and 326 deletions
--- a/flake.nix
+++ b/flake.nix
@ -44,6 +44,11 @@
              specialArgs = inputs;
              modules = [ ./hosts/vm/apprentix ] ++ baseModules;
            };
+            
+            collabora = nixosSystem {
+              specialArgs = inputs;
+              modules = [ ./hosts/vm/collabora ] ++ baseModules;
+            };

            jitsi = nixosSystem {
              specialArgs = inputs;
--- a/hosts/vm/README.md
+++ b/hosts/vm/README.md
@ -6,6 +6,10 @@ Voici la liste des machines virtuelles sur NixOS ainsi que leur utilisation (par

 Machine des apprenti⋅e⋅s sous NixOS. Toustes les apprenti⋅e⋅s ont le droit de sudo (les home-nounous ne sont donc pas montés).

+## collabora
+
+Machine collabora (libreoffice en ligne), accessible à <https://collabora.crans.org>, mais surtout via nextcloud quand on modifie un .odt, etc.
+
 ## jitsi

 Serveur jitsi (vidéoconférence), accessible à <https://jitsi.crans.org>.
--- a/hosts/vm/collabora/collabora.nix
+++ b/hosts/vm/collabora/collabora.nix
@ -0,0 +1,76 @@
+{ config, pkgs, ... }:
+
+let
+  authorizedGroupsFile = pkgs.writeText "collabora-admin-groups" ''
+    root
+    _nounou
+  '';
+
+  pam_modules_path = "${pkgs.pam}/lib/security";
+  # nixos/modules/security/pam.nix
+  pam_ldap = "${if config.users.ldap.daemon.enable then pkgs.nss_pam_ldapd else pkgs.pam_ldap}/lib/security";
+in
+{
+  services.collabora-online = {
+    enable = true;
+
+    settings = {
+      ssl = {
+        enable = false;
+        termination = true;
+      };
+
+      net = {
+        listen = "loopback";
+        post_allow.host = ["::1" "172.0.0.1"];
+      };
+
+      # ouvre seulement les fichiers depuis nextcloud
+      storage.wopi = {
+        "@allow" = true;
+        host = ["nextcloud.crans.org" "nextcloud.adm.crans.org"];
+      };
+
+      admin_console.enable_pam = true;
+
+      server_name = "collabora.crans.org";
+    };
+  };
+
+  # Authentification pour la console d'administration (accès pour les nounous)
+  security.pam.services.coolwsd.text = ''
+    # Accounts
+    account sufficient ${pam_ldap}/pam_ldap.so
+    account required ${pam_modules_path}/pam_unix.so
+
+    # Authentification
+
+    # On teste un compte unix. Si on en a un, on passe la règle ldap et on lance la règle des groupes.
+    auth [success=1 new_authtok_reqd=1 default=ignore] ${pam_modules_path}/pam_unix.so likeauth try_first_pass
+    # On tente le ldap et on fail sinon.
+    auth requisite ${pam_ldap}/pam_ldap.so use_first_pass
+    # On vérifie le groupe de l'utilisateur
+    auth [success=done new_authtok_reqd=done default=die] ${pam_modules_path}/pam_listfile.so item=group sense=allow file=${authorizedGroupsFile} onerr=fail
+
+    # session et password ne sont pas pertinents pour de l'authentification de coolwsd.
+  '';
+
+  services.nginx = {
+    enable = true;
+
+    virtualHosts = {
+      "collabora.crans.org" = {
+        locations."/" = {
+          proxyPass = "http://localhost:${toString config.services.collabora-online.port}";
+          proxyWebsockets = true; # collabora a besoin des websockets
+        };
+      };
+      "collabora.adm.crans.org" = {
+        locations."/" = {
+          proxyPass = "http://localhost:${toString config.services.collabora-online.port}";
+          proxyWebsockets = true; # collabora a besoin des websockets
+        };
+      };
+    };
+  };
+}
--- a/hosts/vm/collabora/default.nix
+++ b/hosts/vm/collabora/default.nix
@ -0,0 +1,24 @@
+{ ... }:
+
+{
+  imports = [
+    ./hardware-configuration.nix
+    ./collabora.nix
+  ];
+
+  networking.hostName = "collabora";
+  boot.loader.grub.devices = [ "/dev/sda" ];
+
+  crans = {
+    enable = true;
+
+    networking = {
+      id = 149;
+      srvNat.enable = true;
+    };
+
+    resticClient.enable = false;
+  };
+
+  system.stateVersion = "25.09";
+}
--- a/hosts/vm/collabora/hardware-configuration.nix
+++ b/hosts/vm/collabora/hardware-configuration.nix
@ -0,0 +1,32 @@
+# Do not modify this file!  It was generated by ‘nixos-generate-config’
+# and may be overwritten by future invocations.  Please make changes
+# to /etc/nixos/configuration.nix instead.
+{ config, lib, pkgs, modulesPath, ... }:
+
+{
+  imports =
+    [ (modulesPath + "/profiles/qemu-guest.nix")
+    ];
+
+  boot.initrd.availableKernelModules = [ "ata_piix" "uhci_hcd" "virtio_pci" "virtio_scsi" "sd_mod" "sr_mod" ];
+  boot.initrd.kernelModules = [ ];
+  boot.kernelModules = [ ];
+  boot.extraModulePackages = [ ];
+
+  fileSystems."/" =
+    { device = "/dev/disk/by-uuid/ef139717-388f-41f3-b707-b0f75af3f546";
+      fsType = "ext4";
+    };
+
+  swapDevices = [ ];
+
+  # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
+  # (the default) this is the recommended approach. When using systemd-networkd it's
+  # still possible to use this option, but it's recommended to use it in conjunction
+  # with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
+  networking.useDHCP = lib.mkDefault true;
+  # networking.interfaces.ens18.useDHCP = lib.mkDefault true;
+  # networking.interfaces.ens19.useDHCP = lib.mkDefault true;
+
+  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
+}
--- a/secrets.nix
+++ b/secrets.nix
@ -37,6 +37,7 @@ let
  hosts = {
    apprentix = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDCJV6jqQWEYuwi+OJ9r/4TbBN/cK9NvYWNiJhpFzcc7 root@apprentix";
    cephiroth = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOsBGkhiu6l3jeo15cQHMu3dPyL025zXPV2ZH02EDYEt root@nixos";
+    collabora = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFa2D9fREtO2r2oIx6q9JAKFUHtxGbgEPMjkx09DQSU8 root@collabora";
    jitsi = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIB6jVMIZ5y2oXX9HOkw7r5UUjw95MlFaFuu7FnEC0Q8z root@jitsi";
    livre = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEVfKNokHG6ig32hhQxTep+fKFmKahlDClPrX/dP4/gb root@livre";
    neo = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMGfSvxqC2PJYRrxJaivVDujwlwCZ6AwH8hOSA9ktZ1V root@neo";
--- a/secrets/acme/env.age
+++ b/secrets/acme/env.age
--- a/secrets/apprentix/root.age
+++ b/secrets/apprentix/root.age
--- a/secrets/collabora/.gitkeep
+++ b/secrets/collabora/.gitkeep
@ -0,0 +1 @@
+
--- a/secrets/common/root.age
+++ b/secrets/common/root.age
--- a/secrets/neo/appservice_irc_db_env.age
+++ b/secrets/neo/appservice_irc_db_env.age
--- a/secrets/neo/coturn_auth_secret.age
+++ b/secrets/neo/coturn_auth_secret.age
--- a/secrets/neo/database_extra_config.age
+++ b/secrets/neo/database_extra_config.age
--- a/secrets/neo/ldap_synapse_password.age
+++ b/secrets/neo/ldap_synapse_password.age
@ -1,33 +1,33 @@
 age-encryption.org/v1
-> ssh-ed25519 /Gpyew yZcdlis/jjjCgfOwzH7fQVcVcT5s5p9RRk/HIhDGIik
-SwgYClN63DKDhHEpzLbqM+3p8g03LRvgoNmInTxHhEs
-> piv-p256 ewCc3w A/qh00euL6PP4PmDZ6mno3aHjLOhj9uOVO1vSBqCJRkd
-McJ7lniz1B4YOMZAB7L+vmReAfP5S8s5SN3CHq61NNI
-> piv-p256 6CL/Pw A8so94kmhiL+d0k5ccWuGxqP521G/c753g5+Z0DRiEzt
-NsxICOht0TGbVdl90JxMd2npILF3ge5fD3pFjeni0ig
-> ssh-ed25519 eOAUSg NI+6HUmWh5v0x/w1iafu4AFgo7NE5zOmG+yChNn/mg0
-+Eef1VJeXcZWtMzXCRwlvxNnZwMhB7kjGpNmSBkME30
+-> ssh-ed25519 /Gpyew WTvClaBByXLVpVR6ekYwJpTWhw4aD6bRNDEp3DVu42o
+IyYxHrk6+KqUv3qwsBx41uytPSOIs4LaL6mxSxATCvM
+-> piv-p256 ewCc3w A6bdKPlL3uBjAJSiNFTeQqCvtnz59ttl0NfroCrnZAhA
+tAwEPuXLigJmX/wplhPUHbeQZ255gwnPJDWhWo4qVmM
+-> piv-p256 6CL/Pw A5drVBtV09oKblh9aeFfmhVy/UJex6bVypvPnRj3L6DA
+xoKl9RB9PVet88UoH/vRBI/tdSOoI2NVlnTk1eNdnV8
+-> ssh-ed25519 eOAUSg zhUS9oNXmH34fb52bdGlfkAdQMFq7+tiOlSSqRJXLzY
+1ISRA6o5mk9RTGtjlQjBJ8p02Ey6CJycZrjHfCoj5gE
 -> ssh-rsa REaZBA
-DdvKzbZamvNnde8HSnLxC6hodXeDxf528/+8XRjilZR/0wvad4q1COE2OD8MdnAe
-UhWxhBke15z6c05qFUWBVeau4n5jjYlCwcoHgS3a96aoBPd13nybFbfjInY2o7d1
-nSnbG0KgnKAK380+CYMRkg5UtNiRBCIUVVRh+NkYu6RieJzni+8Lc+GnvPEYATZy
-e7uz90o99olIxZHBW6qgtqKEm1Lwed3f1WoFZr0w2EH15SJZDPvDKJvxWMPJp4Hg
-qqLc3yCMdA/1WfDiDZeyD/nUMOL/9YE+WBEQd+LBokFuPo51/LP6gh1LQXgjbr8u
-ln0HIM+hPPpRaq/chi/vHEAmvbOFKqQAe7Jfdxcm00TXlDvgBR6aT0DTw1TIlUEY
-Ys2C1i5r/H+t6WR3Dq8VOhbl2yjFx7BZY0O2MscxEH69p8kpo+vLVMc1OZF3g13u
-X/t6+H7Tqd4ARTJgq4wdvabcm7xfcgU9vIg+DCKyTFLgRw/EgAX7Czb/4lyI5r/O
+fjMa8z12MNcJu1pjIdnHxvqDGPOF0Y3+Uj2AgsnKkwPLchtmMhJb487j0zYjwogu
+EseKAuLt+2N+kDYco9O5nMeTtiqd3iOczazrUZ5dubxy1Y6r/VHa1MexGoTJj0ma
+qCJ6KcsbVndZGHMf6ASJSa0wqdnd61zvCIU9Tc7el6Q3d+86it73Z93eJfztiNFm
+KopgrKQLsZJiLCtd2Iw3SQB4R57qiDZxPRHc/xwE2rZRd7wZ3sTWCrTN1VeKD38H
+sNioXesU9N/XbckA54oY1+8h1Ihihrce9BzmvZVYHLYvOTHfE/EqU0B5hjt5Izgt
+ef3ObzMSP3isu4ohu+l0NJksIDIJhpIcvkQg+bN+6iADcP0MljX2805naVlXAf3M
+jJ2lLLxUOSG8ly/55hVt660DBTxQ4h6MolSBWI/lhjYwXGNAob1Evz39kIgm9X/1
+wXR/ZUE+1Q0fxfYef2v/uQ0IKEaKPi8yH239zaY4RONKrpfJjNLPfELdJjE0wUl/

-> ssh-ed25519 J/iReg kuENtYdA0fG7DwCkbwePCKy3OA1WSUXqCSV4gwcB4S0
-AABkZxxkwmTG+ItytXJk0GCKOfAimtF9pULycEvJOTg
-> ssh-ed25519 GNhSGw EIWdGv6b87oB/5Brb9cQpaC3+7ekIM4Dl6zkKYHVPVg
-hTrM/dK9+jd1e5FJreDiTqYpbctXRX96SFR9PrFuUtk
-> ssh-ed25519 eXMAtA Y2XxiI4e4+W+QMwTUebsZWSDv2SkiWh8k3x6BM7Rs2Y
-QFKKJ27Mo/0LLkUrrH10uK0BXQs+0lxFJzPFw/aCQoM
-> ssh-ed25519 5hXocQ y5nGayVqdmFZ5viwVPJQR4Iju7K587jx3Qlr87pD/Xw
-+VhscbazTlepJpAwaHAKrBCu3P3o9dBSGkkI/oKS7k0
-> ssh-ed25519 bRHVVA l0lSg1JFQegdRom0yiI8wHwVHvf3+yCEa2f0U9A9XDo
-A82mNiuzOgbdticuLxASJqelTgjFO8aEv/668p3UBjM
-> ssh-ed25519 HgW9eA 909r8fn039PjprN+GJE9QcNvZ2/oNjK6A9rkVWSJP0Y
-3vyAItWxIwvCOAo9L1PfubBLWDtsE66dwLeItg37gL8
--- Fi5oUoTEKhdp+jjCRBEe8vzM6Fwk6A1V6C7jlXN3gE4
-áLY{Ý¤l/yD¸»YÓŠ	ñTñËí<07>×?P4†W3˜þÁiëE³Èëë-H*™Y0@×µú
+-> ssh-ed25519 J/iReg COlfFebSf/s7lKjBq9h4kgAy6zMf+hrRN5zQkf2rGFM
+025SIjIoNJkTReTcYvyxXWySl6OrNVBvDLI5HsVyJgw
+-> ssh-ed25519 GNhSGw hT5oqgHVHMkCz8pHc2XxI7yyt3uFaRu8F6f3xoW6VAI
+w/A1CiFkYcLl1GiVBG7qjJAmQ/Rd3AvdiGc1nxDgyNA
+-> ssh-ed25519 eXMAtA UbBEC8MaZY3SJMQHA1VdZmhY722X1ExyNZuME8oCEwI
+IZ3waDkdXgY9bLaSHknVM+LJh+x+397cgRp6OV0Ve9g
+-> ssh-ed25519 5hXocQ yPxYsrn/FaHWrgCaZEYXmqmGMFFkM93rI9RO0ptcy3k
+CAJg72QQOh6g2XRYAwrkuIajY/tUY4wxdUNXjoTDOF8
+-> ssh-ed25519 bRHVVA Hr6g7m6P3/OO/JJ6iJhfq/qf/b21hmx5heYLabH5vE0
+RvPOA2StY5obXZ8AqjIt8wyuuGwzq6w3dJj32bP7D6o
+-> ssh-ed25519 HgW9eA RdxjcI+oSZ6MBkJUOtRuxyFiUvrw616WkdvKQAbOwio
+Pak2LAJMngMh5BHilHKkot8x01Xae2nk60B2b4CobUk
+--- U42DR5LGkGyFrLN4AwWHWc0HANT2GVmlBFQBf0xPdNI
+T¾yç ž:'Ó£N`hG§N	’<>®Ô²ËB¦±±…ZXŠ÷€ÚS>Fdm³8vº¹+ÆUplÅw
--- a/secrets/neo/note_oidc_extra_config.age
+++ b/secrets/neo/note_oidc_extra_config.age
--- a/secrets/nextcloud/nextcloud_admin_pass.age
+++ b/secrets/nextcloud/nextcloud_admin_pass.age
@ -1,33 +1,33 @@
 age-encryption.org/v1
-> ssh-ed25519 APVFfA 8Y4h4CCgf37A45MHrXIpiqqZF3URqadbvaSyfv+j1k4
-sYGF8m491CjtW5osUKPGTU/zETIJCx0bT6WfA/yZfeA
-> piv-p256 ewCc3w AxMBl4dFobbBdzj2/L43ltk1UV4aSE/CaRuS3259G180
-MJX/wUdTRYFGUfwSEp4eXno4Jbsz1io0rvmODFACueE
-> piv-p256 6CL/Pw A1gJEHsgd1ez36YBGXHadGj6mA22gz/crRxjaO6iOjUt
-p8p93AM33Q7N11M/qjzPDam0V43RxWqWfKC/3AVjdd4
-> ssh-ed25519 eOAUSg 2uJ7Dumb/Uw1j5wSliYBh/1cb3F1RU9zvwEtcCl61zI
-ETuBWH3BbeU2k53x+g4jTJzFVel/1Dqove00jPcEEmQ
+-> ssh-ed25519 APVFfA VKc/0u03ABfP/ZrZDVvqD6zoxqxhkPON3Sh4qL0iyXM
+hpAtWGg76gy9AmFsFxLQd4ErdLGODhjuPbMPwKvPuTA
+-> piv-p256 ewCc3w AmgG3+53ifY7mTqcQPwNK47SYJXRhSg6eKq0BsULyfl6
+DFYpn2jiqWvR0G6uHhKQ/xncNBYCf0A8GV8/XBEs/gc
+-> piv-p256 6CL/Pw Ao/Rej9+izxycLqEugsbscibTMvg1e3Oobj180bYLFJ3
+0GVcsvbtad4Ohj3dRyCfU1a7PKAi6jqX8vkruk1OdzA
+-> ssh-ed25519 eOAUSg 2RLaZqVbGuqIRG+Dhuux0BBk2cgNXltxc29qE/X1GSw
+We1/cEncwXFp6FN/BNE+me7g1rcC9Ag3G4EST0aAPsQ
 -> ssh-rsa REaZBA
-gxEwx0kIQltaHYHZ2DDC++ryL2ziuJ0m/hKvF5THA8NJvNHvj7xnPOZojy2Pgbpu
-xXiYKWLFxN6Hl5pywKH8t973UmSdDJSfJr/h7jM8L5DADyvNEbJlOBBBh/1+FMmB
-BWu8mUURQxJvuKr078wvEVKPy6yRxrHQ6+OhLMvEomgiudiSbfBtKQSSOafN91BE
-jrbnGL2IDois0I5EqwfJ88D50b3WP2V/HFPXemIZCJ/Dq4Aovu0aQtL3r4J/vdg4
-YhLP+swdfmCUhWZctf+a/348aclfcMVwPOlfiNIFjyLCPFHRhG7Ewg1YeFg2EcdK
-9l99sV3hBOD8ZqPUsgeK1AxCEMOSfG+GJIz/m9er+yy/ID5hvxZb+T+mnAmdKp0T
-OXjL6R+vLtYkz87OQTEjxBxZDkB+vWFDXFlRo9mbnn9JN+dULGLyVGQLBUhKi+EA
-YOAEbqQF7pRiwSbO1zBJ4rIbP+uXiSp1d+1hYWdFp0DrlzCSTagaGHbYMGEL2yJ9
+So4LCPrBQ9SpQmy2QWiNcVsZbChDcCDR39vh2rrGUdWtdxKr79blpQXz1Jw9gNEt
+8AAQYeUUBhQkpTTMm9A8f7n/vl5sW3ge0Ia4aL2ja8mFvnbGW9CuPCKAnUYD9C7/
+AvNm+DSEsNm85pYnR5bq1Vn4meDsrvehW+8HgWlZIpqFKEd0XS2TgpUdyPgNcbjT
+AGBD6GHT9wX2meFe7xCDllWRnRxoa7IQIgZl6QUg5UGXDK4vDE/Rz7omwvvu4jZ3
+WJPYU7vuWdRKGM/7RiXDkn79q2CBceusTbRKRMYEwmiWeMgiPQccLJV0N/LO2x1G
+031YfoJHfflq2biDhAWgitJM/0YyR1+S/gaJyqfiEilNJeLcISJrcQiJrIomGPXs
+Jwe2umvLwyPH9h7YVeed/aDBNvLwmlxnUaTLdQZ7yq5mLcQdhnebdILXGpdy4YCP
+Yt3U2ZolnCE0jKPW37QcSpt1+FLPv5JhaPN2ASOS/136WBkcfP+OJXmzqMRuIGB8

-> ssh-ed25519 J/iReg YN2z1FgxkhI+ftJLCnYlEQbsw9F/i4LawRGcCr1+m08
-FrQD95+PilJusXuQ/X1GmMmwqbrGFVTQUjdB330k1DQ
-> ssh-ed25519 GNhSGw dLUgqqsKdQsozzcMbPUsAyR+ULIHp8OcS2mqVfnrlgY
-tcfr80cJENiKSJcGEa2lP0g9aVjVC379ofP3mQ52UCw
-> ssh-ed25519 eXMAtA q2Lo3VeyJ/vq9DPbcxeEVDDAbtSK9fgTzXLhGh64ySE
-oQsdbmuILI9bseFveJV9ZhytSD3WxjgX+hSiYx0lHS0
-> ssh-ed25519 5hXocQ EVFRzgV52OLh+TZdSX6Ukqrg/xJr/grnh1IpkqC7sCg
-nurKpP+BRzlV8SZjnCzAe24awuYdUukHvNm9HQD2LD8
-> ssh-ed25519 bRHVVA 6vHWSQDOhPTBMZtw9yDRw4Ed2BR9+n6Ba436ZMMU7Uo
-qfWT7BmI9SQbeSwM7D7AXWqDeAQ2Bym4/Inzlx3c3Zc
-> ssh-ed25519 HgW9eA QO/hL1KXvUQM+O5Kotbo9NYqass0vWl0YMLkTzKr4ms
-G9HPkudm+FDrCijZYXEk+DsHbKqhFgsupOSOqD1nLM0
--- rs8MdryR2jyyqC/2npE5B3hKyJaZyiW6eaOz5Jyg7CU
-)¹Û?ÈÕ¨µkŽÝ -ìül¨AvSÍËKƒ#GªÓ«éT?æõtÃ9!ˆ<>¨–«?G…×P¦Ø‚
+-> ssh-ed25519 J/iReg pxkjocCrw3xFCdPdlWIX0nlwSRzBVA7OepVFzdetrRY
+afhgZtHpSkv96EiJ8e8Yj7CnYGv99WRmLgahSgpS34c
+-> ssh-ed25519 GNhSGw 0UgGqPivV2jPiF4/I3+/IfUvTcLvyudKMIoB4CwNrko
+bbrw+kdqsqfEFynz+sr91IjcGIRVbQNGCkXxntFy3ug
+-> ssh-ed25519 eXMAtA QCfLQbTtYI2ORGysr7ngIi3Z89PA/zNGbZjp0AiTyk8
+4NsUMAw7v7AwDC5dd5QuFlNBtQyTH53y/F98gU6Ptng
+-> ssh-ed25519 5hXocQ zMdYzfF3ZIpxYwwof2ik4Almiszd4wZe8vUhh6+vRFQ
+5xUvD4fYxholtBAiSlHv/rrkYnrH3GWXWzViTg0QCg
+-> ssh-ed25519 bRHVVA o1JNbbsTjZKS74SebLG2etcTdl7j83AH3V1+Xdq3lBU
+p2TxT8q09/GwCx1CJ3GDmU54A84PKcivw1tezHC7qso
+-> ssh-ed25519 HgW9eA TPbb35xx1P/QHMmV+xMBCSAUWIPxSRha87HuPYnQjVU
+mWQp6slqjN4XybY3NR/1VsMJBoVkTB4TUYcPbpz4H/E
+--- iiow1Gn2RdjBDjTzNsrraIgPbBGaohBYJWHcIVp4PIs
+O•
ÕÔ¹ ”ìñ(5~ŸLøÓo÷}¹+k;%‰´¡ÌÐI³váˆOéÏÅª`1sŒöœ
--- a/secrets/nextcloud/nextcloud_db_pass.age
+++ b/secrets/nextcloud/nextcloud_db_pass.age
@ -1,33 +1,33 @@
 age-encryption.org/v1
-> ssh-ed25519 APVFfA MAQEBIjozxqxVoiXynPn+zpm1NH3btLqzeeYVpt9Azo
-grxw4ExhfmfhIppoBNr1fFb2Os1kSmmdTVrG6zLyFpI
-> piv-p256 ewCc3w AqA6O8a3Lfgy64506EQ9me1mTzvNXwxzcreGmQiMCg15
-SUSScnz0xSinLy359I1UdvRhbhYe6MSWw4+5Zb3K0E0
-> piv-p256 6CL/Pw A9hFta8AvkmdCX/aP/Yll6s1rV0dcWuqUvzBAn/tgM4Y
-bUMOZg2siJyIuMo4iguyWvajnbtvMZR5s8C/wm7pT8Q
-> ssh-ed25519 eOAUSg KIcF4co6/MCliTGm8DIJzrTtDcl+iwDSxi28PUgdeRw
-Rpk32l3UPgv5tl52DfixMpMB8/kU/tRWMCUtkUdXQNo
+-> ssh-ed25519 APVFfA MEREiy+lz/+oOWQCXgoZFy+YvLNJfYv5NOB88QPar2s
+JAJY3kKijYprxPz67R+AR5ThBJFkNIBufaR4hiJvgcY
+-> piv-p256 ewCc3w A0DZfG2CP4yCfcmPNU8cOJTwrMin4WS34a9HTmAiqKr6
+lyGi6hvCWvlKbVlNwOFxySXk0KQv/2rfl8O8vggwksI
+-> piv-p256 6CL/Pw Aqx1CC6L+wOcBRYYRS/EmDSLiLlgObMDB1qdX7RZOmNx
+PVoFcS+oUWZPbiRMgkWnvdqPik26kUcKJRW+ryKhnDM
+-> ssh-ed25519 eOAUSg KIFuyvO0dsgnUxC/17pXDyJUb0FcsT0eNcXHkvLe3Xo
+hGrBguu705aRlXs2jB/ne28T2J4PnX2MgFRtEG2Hn04
 -> ssh-rsa REaZBA
-U9B5y/VEgTjuesOH9c0FUxrOtc9EXqxgX0HkI4v8ozIf2dmYHSn3D/e6sZyiwOnX
-nE7QqdzgX21M5MZ8XxQ2cWM6a74Xoq77/YJXC/wCcPGL8iZlrQNO/UAoqaew0kCk
-PAGBdqyNrgxufimX6thLRbY56IaxuIyyE1aH6bUG21RBFh2n4aYHQ+YKWPpaCNoO
-RKJYI94w3Qt6uXVrD7TmtvjynkN/j5xqMoT+cE/65aUpIGmnCEqxdIsJz1qnFSO8
-yWOPdk7OmFShUSIav3iV+rcn17cmvyc7boWFAp8r24+O794j6umRy30KROfmkuXp
-OFKQWY6KB3Zja/sk+XVeUsABlqQmviA4M/JTJMLUdS7Aa59TyAmwg9o5YUDBfk0T
-aVRaFaqC/Dw/JipERb4kN6Bu0tGvHii9cW/u8T3Oz6pXsJ4r0HCtj7hf3aKfvOr4
-NEShklZcXBAk8prbZ9ff3KdNCCyrN1C5PmFG3mTp4nHZrCx0aOvg2ZZ12lR7ifGr
+YMkNMaoSHxmWqdkj0J4jvjVaLKYMmCRVn0JdZCuYEyXDCNzxxqA5lq2v6qb9Q7FT
+Zm9AXaSLxmEA0n/TSO6z4OzGwapvYfT4CWo2atugLn/WyxnkXUujaCsBKqIz8EAK
+cbB/X4wL7oQ/6CPs6s/+yqLvrCBpglBqefOOydzko4zlnYLd3eHqAg/UleHjwUrB
+amIWY0LCk+8VFfm2nZgavBppjUX22PekUQmL7DfEJ+sxw7ggZkgCA0858C/V77J0
+bkFZPNaEAxK/8XrTImq7DZJiDlL7rrsnLRU4WlY36JSKMu+sAnBgO1wTS2CIwBFp
+XqAIRAfKHon3CpR47IpquR1EewRIXdhY4yIYuUFfR8PGmw/+2EPsSQB9C8uYHNA+
+lhGqZ5zwADt/c8SGiWZ1uqOgUDFJ5YLFpyUS5+DekUeEkIHV8OofMjrZehWtnkVw
+GQpxMuqfNJP3XTXELTzu9LenyqfqEgSoJmd3xYuVXhZDh20DUU7Q7Wfxsm8v8oL+

-> ssh-ed25519 J/iReg oTQWajjCPpWVnuUP83b9mdad6cHdlgmprGg05dSUSwo
-RaPRSlXOJyV+0XHQrVZ0lYhTNb/0Xe2dGAAq8y+p/tQ
-> ssh-ed25519 GNhSGw ohv6XFgt5qtrpGQ+GOgVjJvs4wpH0HH+tFcywbaYDhs
-twSIt9rqFJz0gSIZogzSq0ryxMKjihXtm+07PN3fMXY
-> ssh-ed25519 eXMAtA dFYPMp8j772z0aqlf9rWXMBTvj5hfaXN2ZsXqpyTy2E
-8YspbXyMI3PMKoOsVkJevOScRvabiXYoio+WJVg054w
-> ssh-ed25519 5hXocQ XIe/NnmGMO7LqIfLxuLz8asXXOyAHnKoz+68uVvSaEQ
-fnGJ0WYGFeRahMO+qHMAKcUwCWpnFZ0Hfqnd4wAT9iE
-> ssh-ed25519 bRHVVA e2DbBsSVSZpRaBNHR6CUm7QG44DfcNIs2mlv/dc+1Hk
-gl1VZpctEqhSTmA3BNip2gPSh+rxfF4aoQMTda3wfzY
-> ssh-ed25519 HgW9eA ctUKbED/qOOcp6O48fSRRJVqdiD4/c02PkHkEX/kLEs
-OVnruVJsetx9KXSnD5qXesGkuckJCr7S8BTMWkZNffk
--- CLMpFgw5tBn099tUgOMWfCM7e0JdkitF6Xu2CAVaV9M
-GêòXŒ|¾®Xâ^òw²À%>c“5fTªøJjã/h’éÍÉôuƒ}¿[é?Ëg¹€ðèæd¼Á
+-> ssh-ed25519 J/iReg ViHzr/6GudA3e+77/QMwyo2FO0aaz3ZDWrtbLDdE1wY
+5oMYiaNA10pg7BXEmTbnWo6H7Eqo/AgppKqohFUl1vU
+-> ssh-ed25519 GNhSGw 8KygxUJSSu7cpkkoCrLbJyYC1ffVmJjONlWrUFujxwM
+ySVRJCCgLXE9j3YVWXwgD5IDJI08aDLS7jpaGUUswM4
+-> ssh-ed25519 eXMAtA 32fhdjbzEjoG932wsl/FQB8v5gapPrzaFoApP+OrI1w
+/k5fP2PgHZocd2fqwGzVpPKt7983x9PuJnF9WKlor2U
+-> ssh-ed25519 5hXocQ xnB6v7zVJ65yE+IrXBX4HVmPk/XTT6SR1ijj4pzyU1U
+NCTnzpVdreHIysyPFSOta6o7kr/2kqSzUS7xbyC3fmo
+-> ssh-ed25519 bRHVVA T6EAi9J7TFnC0JASXaMP3GFNRsEh9elMRx9TT5tTGyE
+Y/sLlkfSbNxp0PnhTYXy/SEBTJ0ZaNx5UC0kq/6SfAM
+-> ssh-ed25519 HgW9eA QHVry4wJQx8sI6U7SImagoAkF4ImVO8yZismrHuzpms
+pnFyGRf0QRTSv1+w55IpdX7xYm5kkod11EoC1WhrEG4
+--- QDxq2YkgBfBf565HppCzUQZ5RwEVmN/+7hcUyz/FdkA
+yæ<EFBFBD>gØ~ðluÌ5@Zq9¯x°hP5Üë¥8$bA—Ÿç%ú'/Š‡ÊÅ™<C385>Þ8ùŽEÉjøeÉ¥
--- a/secrets/restic/apprentix/base-password.age
+++ b/secrets/restic/apprentix/base-password.age
--- a/secrets/restic/apprentix/base-repo.age
+++ b/secrets/restic/apprentix/base-repo.age
@ -1,33 +1,34 @@
 age-encryption.org/v1
-> ssh-ed25519 cZNEGg OOs7LFtS0nQv9hBo3470MK2ekBcMmJ6z6kEHmYRMlis
-6ikMGSwmbh48AjUwYdgQlOCyDTNcAecBz+wQ5kqqBg8
-> piv-p256 ewCc3w AuApKu1vVXnLRWeJIu1UFDc48t5yaL4DCPWR0IdMDUzL
-vFpM8hYUflRzI34o8LdMaqq4xsNVR2EceMscMVPnwcc
-> piv-p256 6CL/Pw A1EUA9hqSqMlZ1mYRGSFlk9uDeyGpkZqMfWhRs7egUyg
-i7A5jWXR4xZyQKG1FYoKqukzkrWPkZEirY9IT7wVB98
-> ssh-ed25519 eOAUSg pbwTwoxW8b9/+3Klz7ouUZfcr22g/j4Fk06AITQjPSM
-WzfyJZYBG0allKWsJ253j///q9+HPlXAmnx6QLtVU1k
+-> ssh-ed25519 cZNEGg 4yE5rMf0T/Ck44tKN0QyRiZXq3dCcowZ0guI1QKIfk4
+jpLH9R+yHea5gTz9X/XqfZqdl4UsQSqFbx8ooy6ufuo
+-> piv-p256 ewCc3w A7tSNH01szuaE5kyyuTEfeefMyR/VfvbNEw2A2QSgiAv
+uiP96aSJKFCO/6rGOZSrfUSuqzc7+JditcbGKlKy8mg
+-> piv-p256 6CL/Pw AuWkuPTVIhOEi2x7cjTpz4KYMdGn9oTx42VEp5hssYVP
+C7g5ajOKpUK4XrtUw5/j6qEMCo9SXRBV6oaxabgBAqk
+-> ssh-ed25519 eOAUSg 7ODoSYHXtdMNbMEoGAeqIh+XZv4zp/TbSamGEGbMl1c
+wsFlrjgc2AGa00KtErp/tZ7n8cFBQyAGFfth/o/tGrM
 -> ssh-rsa REaZBA
-bSKBvVK+FdddpA8VWi+c1g4EB29Tnt78xWgA5wz5HjqZVPyFn9qn1QGRv6D1WBzL
-LeW8ULpHiycJmU/lUHuaKypULv+lchIjS/r26zT1CrGKvlsA43pwCno1Qo4IlJCI
-knuCC0859wt19hn4PMbElZ+2HFp5zsHe5xY08t+Wu2Mctt8N8KOvwgCZyCP/OTH/
-l/nmeSi/+VZJg/U/jzGFtHLd6uK9Y7ND5ifcazBYyVWDLOpkbtcpXn7W+eIT7sd3
-LVUooCR6bMY7NK7aK5lI1I8jbHW1XKT+wG+xc0liH68o6x5IUGvtaM+njYRJHkzk
-nIOA0CqvbjquWRQeAkIRgmC7QIQjC7KcEIqTGt9vCW1pDdVIqGwntOxQJ4QQcwTR
-57LtXm0YIBAJqQ5M0PkAQnsbgeYeNALdpZZC3yHAWZ+vsOE9nrSLmV4KNnyusmJd
-kKxVOsgdwlnadn8HsYewGKvK/Ikni30vCyU/T41zRKabyODjQ3clN8SxA2cPSMQX
+Dgkjbrh7XCRvzCsCWVT09PdLXtjF1I/cWSAZWvDZdvc0LweAgzRmutXLv6YncF09
+vQ5dACCX83RSSxPkxqeLPY/ym//U9yWwa+UPUqTUxcPagDMnS/RH0ExmcbTg7PoH
+ArOK9vfVhTR/uZUJM8dEDh0C/b8J6UKibwDojybn/nuoqZGePPEvTagFud9x7WiM
+/FGi8ByJVx07ztvGYF5Xiy86pJQ+5xwK1y+1rtjQO26eFl6szMBn8jL3lhT7IpUi
+5jJ/ckF9or+NKIPQE04MRkEo4TKG9emjMsjw0NWaEkK8l4RxVaJrNvpsUsKLec2w
+BHOvA2USNOAuulrOlHJG5vBGBwy2CCxUvxPNb8lB3zIOP1jkLP6dDWd6lVVwS+6D
+tkcSefbKX+PbUiWX/x4SjhhT9YKYZqU8w76pProl6jeEAnJz/B12NQMcRumfYP6Y
+pSMIIxnQ2yUBmTxY3eT4JYkBUiY83uy19WfcuXDbBTfBpP1hnZvU9VQP6hjcZZBg

-> ssh-ed25519 J/iReg ne7QjqYm5KzbBNYqTGnX9h8UdSl4wsbP9UEbvEfOUHk
-FH20UecBHmcqorKpoPV2ER/5bW4P+CmreAHLUtub1io
-> ssh-ed25519 GNhSGw YYpc/dHXxNBZyE0m0jegwvQeOFKv3X4GUK9GbCjBtWo
-6UjSLfkEVOefSQe8tsJoQ+BmRGNdARz24Fvy4eJVLyc
-> ssh-ed25519 eXMAtA lsUFyP44qpmqbyAmUo9ZaY12q/0Ys2N+37OiJX6WHCE
-IEk3mU64bH8O0MXx4kTORZeYdV1XjSIeMG2Ti446krQ
-> ssh-ed25519 5hXocQ YHWNDqkKYBGm8KqJe3kNV2eqNxW+NYlPTcR6bLq6FzY
-td9tGpVszxZEcSMsZT914yU+5CXYKlu7aL8+HeoiWtU
-> ssh-ed25519 bRHVVA Mmt88YYyToQPn+WYuj9J/Zx5iVhD43iwjjkEArUfOlo
-jPiHe7B55I6JEuO82V4QVJylSQrJQCvy3WRMguGWg0o
-> ssh-ed25519 HgW9eA NYyXdOZevSgjJ997zXQRGg1EDhYrBlQQTPDh/3R/JVs
-jb8ahjqqE5bM90OAyC71BqZuPwtHGrNQ+SISZEiCPTk
--- Sh5WRXScpHFJ7P7/NV/wPink4SQSl0iPyUCNAQc6xYk
-¿iéÃbÎí/Ki×Ó¿¦àÂ€t›<74>lŒø¾F(}”Òdy²xqýJ¥1°)Òy>Ê¼¹ÉàÿÕ–ü]*Ïu±Ü‘ÅiæfÍSÖö½Ü”¨=N¾Hà˜QìbÐŒFc–sW{^í€‡,|9ZÛäI¯˜œœØ¹²yŸP2éŠ	ÔÔî&Å<ƒ>
+-> ssh-ed25519 J/iReg Mm+wU5LNrV43Wi2Oe8KgozDM0qWeLMAN8gNXQ7amuyg
+gOhY5U/knFOydERodNiOjRvLz2Z5qWUeLA0/OwlWzvY
+-> ssh-ed25519 GNhSGw NeBJ6v8rh9OOL5SqflokO9rZpmmiDTivU2VXtxipTDc
+yBAmTmNEyzI57M2UZaCWfm/fj8khwzA2FoSx4eD18P0
+-> ssh-ed25519 eXMAtA Hs9CS6/PKfigvyxjPVtEMI81T609jf467b9FXFRwYHI
+o8QMsLhzd2oQl7mx6ApBGGwBoHlIGi5KUf/+1uYT0l0
+-> ssh-ed25519 5hXocQ wzHYIxMAUJ41T8VjTbVS76Numat3lEEUhlOG/ayjwGg
+iP3oNKsen75CQgvsUxRSIwRyTi8ciFM/az5bV4igZVg
+-> ssh-ed25519 bRHVVA +rQA0WXqntTB3HLcgIBfQICOCsr3arwLkalFqyuOKmY
+EcLV9p94uyVowuCUbtgFSUU02Hq0FgqRwcxFzQI84n4
+-> ssh-ed25519 HgW9eA nO/v7qGEDpYGritz4PfipnENjGkMyVkOmh7bsH6Vrio
+j/uyrtdBhlCkyNwzuc/74oraD9lzKUntUpwvgas8Ccw
+--- 8IwFQRcJgpWpwCWc+zyeUir2onPBrxi6sMtayU0bAGg
+Ÿõ«ýIÊü›>ímhÆ½·A|6ˆN
|jyts-ô¦ú*¨o©QÂL´s˜<73>‚q•Å49X¥,ÍWbžˆùø´žíØHT^Â¶N\~W<>Ó’bÕýØVìîz`r_
+ß¶ÌËüºE<C2BA>jîFïµ,rà§ñˆM#³ÿ@ûg¼ERìÍ®ód¾X|H Û
--- a/secrets/restic/client_env.age
+++ b/secrets/restic/client_env.age
@ -1,54 +1,56 @@
 age-encryption.org/v1
-> ssh-ed25519 2k5NOg iphwjY6KTQBlDB+xupTUsnA+oTnbC5bq5Aw1Gc5gkSE
-0G1LD+Uugj8X5gwdBuy+pV9VmvNv7wSw08hgbFRyFKU
-> ssh-ed25519 iTd7eA PjkGZGwQdyvrKHGFp8/o5bOOmKc0c5JO3wEuhopC4WY
-DPkgAMrPBSid3XTO6l3CT/E9cbYqdces6xhSqt4qfNI
-> ssh-ed25519 h5sWQA 3jpGjR38fWjze8IK2UbOrbG/YeYoHlMaDBrMVdymdkQ
-FMIs4fe+qBaSXFaXZK3GhqNTxCF8AQUcmrwi3yKlm2E
-> ssh-ed25519 /Gpyew f1jmWk3hJBQLJY0sD9pHE5eSmTcz5iI0xpTYmQ+yQyQ
-qWRq8cMDByNk9vrob6MdfFK89gCjEeb2ZLysn2g8Aj4
-> ssh-ed25519 APVFfA ISTh/wcOopJ22mcaqF7ar2599bLRHoRwxrqoP4YrCl0
-vJElpAEhENDI2AjMePFLxF1n57NInwgKAZ49QCMDgZY
-> ssh-ed25519 FtI9pg oKxYxkeXg+7j7rVWmndjnJVweYMgK0kP2N8C2q7ZQkg
-LcZ6gw18jq4J7LaiVQWM38OlfDCCL7sH1UrnIm9h+sk
-> ssh-ed25519 hTlmJA 9ipUGDHDrdKECQ3e9N9lrmMWlNPpzvfelZIElvyCrlk
-yZVaTHFRI3BcOVUs+1TnHLErTYpb+kM4j7BEQ3QB2DU
-> ssh-ed25519 GCcVXA cIRv0Z5vNWP1hIn7uZayGgJHqiBhjIrMm2qloqaBnwY
-3n1sxMUaYnj5cHBY7b+Ra9OPxVbqjhuWkAH1KdePrYY
-> ssh-ed25519 LAIH1A qd1dLUW3zY/7Y0INwtL8+dOiP8M8S4SWWBay8zDBWXA
-Y9tGCY4neOP7N5AGxnlCvs2W+msjo7b6tdrf0/Q+SM4
-> ssh-ed25519 qeMkwQ uTiS8AtKooBlZot3/l+jnzopSUClCHPHgU/I8fP0eHs
-EDPcDw9hQtWXzlxbEfgDFMyjDc/VeUzQCtlrsFnblpU
-> ssh-ed25519 TqxOLw BYJ/uZj8ZqijWrYIvA0nJnW3NkbbJ0OqdwOOpcto2WE
-ON4FIRPD9/HLfaZZN7lPXI5xGLYoxomo3kyKFFFCkas
-> piv-p256 ewCc3w AkM+QGeQZ+XKybjIduR/Wna9IjxhPyypnofEQnAWjhdg
-jksinVMSrleyZvwpczOyF/IooGSuTE27tY1PVy3R+bI
-> piv-p256 6CL/Pw AlHI7a3AN6Znp93JiKdrldYTHrTcyXPMeUjISohRJzVW
-qw11PVqKP8QEXXR+M2JGZhgaWaxxjPDmDmluczVeb74
-> ssh-ed25519 eOAUSg I85eJ3wUV4d6ckeVAugB2/AN0Mm7migYt4MzoHAQak0
-e1AoHcby+Dv+fYg1uyrN5cxktVnq4GvbOXIuZwW/Ee8
+-> ssh-ed25519 2k5NOg 4JFNNUIuLhi20eYVbY9ICyhApFPufKB65sMto6xIGHs
+4oxn3fdSmT3TGRZA3+9X2+BwtRgYtm3wc/7hNbJNj4o
+-> ssh-ed25519 IJtQuw SzCJGlEO6mjPnyX/CgeZJg/xUF179aO/EuM/huuyBjM
+aC2gXZtpehPoox7YtOH6fMOHbkKTjKQ1MWYkynLl7mQ
+-> ssh-ed25519 iTd7eA bLK6jmXk+L7xy0oUYJYXsneIcVO+1XfBJ2H30TcpYDQ
+W+alCUUOaKxhwXayZc5PiX1xD26Hfs3vbgxbomjfsLY
+-> ssh-ed25519 h5sWQA 8IKxZOZNiEJ32/KvewWqJ4/cPsY0jMKZgv6lNDQ5Qio
+cvqXnwI1HoKpTm8bHkwQPF3OZSW1f7vQwzAW2JB+JkM
+-> ssh-ed25519 /Gpyew 50ovLI21zrBpSqSCcI473jXg3t8MsgdiuF7zcxoJ3GM
+QOw0d+dLT2QabtpqffDOFnbWdF6fGnK/JMAR/ndI0Vc
+-> ssh-ed25519 APVFfA dUnaOCQw7Llw5Og14XYjNkbfzS53uWfW3v2abI51BlM
+SV6X3zay9cYCsucv/Cy1/eUUz9f88f+UhUtU3flWVoI
+-> ssh-ed25519 FtI9pg EPd0fYl8gm32/S56eSBfaSA4TF0ROeBEMcplSbfuFCw
+kL5nKEZ5hDFH54aTKypdIZOYcX4lpfvTPxIHsH5X/rY
+-> ssh-ed25519 hTlmJA 7B70MXZ1+GKDGKHvG31AJ/i13amQYhOne3ME/OOiQBo
+muyXxDQ65lKjRyMzbx6pyM+v0nzyGt1en5gfbRPafS4
+-> ssh-ed25519 GCcVXA SvDOf9dh0DrzqorXSuSqr492gX9uX06VcPCWafKkJgc
+DZcPAiQJ3Eh57PoHXwBprBIu1LyRcjfolDQ50Whqs5U
+-> ssh-ed25519 LAIH1A f0u/YZWMimYF9SGAUe8SqErStEE+n6LDGRfLVmudBWU
+zb5bX13V9VOev2ALw/FVoAi/akrwwxVHN8iBxviMDPc
+-> ssh-ed25519 qeMkwQ M+sbtxZKKIn/mDLPbwtMLY8eBu8AQC+SZHrJ21xS0S8
+7V5TniyCiu2OBv3yfvAmQ5qYAsKx/pjRk/w/GpA8Vo4
+-> ssh-ed25519 TqxOLw +VRoNFpnwUcBKtoM0czMCPQnFWVMAaXYGja3OPMFEWI
+WgYU8fwOcdTj7kwCBZMpmd1DnOHVIH9BI7utv76Zr4U
+-> piv-p256 ewCc3w AiSwRnJeOZaM8VGMH1ayZqBrrMtWqOARAe9jRasljSCA
+psml7oaUtdOknJqShMzTCCaE6uUlkCkrN1DN8V95BGs
+-> piv-p256 6CL/Pw A1c1t55i+QJ8lHIQwo9y/SXta7gZnSA8+/fZ5d5Oy3MT
+TZuKjCJye06gbfxwA9L0CqiAVCO8PhmN0DZ0DuLdIt0
+-> ssh-ed25519 eOAUSg XRVpYda48UM29JBk8aoFX79HtSzqtGZzI3wWF+UevjM
+WDSEZTrP9YlWhy1niJ0knJekR6u1uypTWsL7PhK9ffE
 -> ssh-rsa REaZBA
-GXQXYIvUXPnI6MsZXQQil4PXUUTQ0WzNmwzpLNwIoJKfjcNybyEwAuc42NVWQuwq
-pDyEJNnl2iGD4bAPiLvqfAtWC6rl5zssef2vRxH7KTwihKGfPZhJ7G2eRZlq71w1
-F8Y5+sUiNkLGYL0yVHmVtS73E0lMs31wWNPA0/JmGk0qdvrR2KyPiKIar3thTjFk
-XUlS6cBWPFiHO+nvwl6+jKaC58D8d6iruPVqa1LWMH6ARDIjxbyZ1CNbeBskJddw
-lgczgQ9/LINQohpyDlizwTsxFmY55t1X8sQ5q881Wlp1c9ISrvtKqysag/h/rNJ1
-1/0HlXnqekuUZQcjRECDiGRYrVXaXsPwNnuAKPG4D+MMm+TC1ZmJgFlPRML7H0PI
-9pjF3/MEpGndHhp3zUNZzFU3aVrd9Q++n4zRLARnH4D2VBxV3UNTwSsCe5YTj57j
-K3DaaLFiJGeUQJzzm9sU4oPOcE2A0nVn1QUTRtyMNUv5/xRMv1N3dVGlknDGQOid
+CcMjNE1VNUuHms63f5e24cACtd7I0BTrKzgHhaZhI1bLaW18P8K3hwVnZawF1kzk
+OaUS7vsMWAxQbaunBknX8Cv/qcMx31jGgpQDozLIoI2d/7ydINgIhTj0dfAqh7ua
+qie/tY+earnlfw3NmUgjncZ838bl2EnV60UINGTAjyEmD2KZNpl9Fvvqd0qiDZtx
+XoDPva8rb9NFmcMdjypDIYIcuXFrAhFthcJM3a0n8+sOilbpcmddURcvg6U0aBLb
+PIHt7UbUxW+nKjijDCb+pdcYLcwRCtN1L4+VJcJOaiCFwLfYJRxFEPqw2zvjbXsT
+PdYlK5bjD4zkC23tpgnDeOLkvyizAQPIorhdfq4FnSpSiFQwL7U2u136chGwP3Y7
+II29dvhWrujxpB6DlERg8P/lZtBBYf87L6qr9vIALETXvOdfwJBFkyoWaGdixkNH
+lBG5WtwQu6PDLVBXA1fCIi+yGeMPzQnLaz586axJWWHEt6kvitM5SzS0EGy0XFeb

-> ssh-ed25519 J/iReg S35By/rzsJGLNxt56XvJ61I74HI7X/T7m++SZik57h4
-ZvVZsPFEXwc3prEyKdJTpwvKrC0iilsWAiCIN42igkI
-> ssh-ed25519 GNhSGw YVTF6SzawqplQLBEvP05cXSsER/FuO1gt8MQkX2lsHo
-o1vBSn5Y+2jfwZLrbbKvQxqAgisCS9KbJ+Hiu00ZmjI
-> ssh-ed25519 eXMAtA 3JhQv+jCWq8HYrJuDpV/sb3UIsaRR4w1eMTlCgYmoGU
-z2f/XF7Md8ZWulNg9rIyisYk4uVikH68upWr+0BL6sA
-> ssh-ed25519 5hXocQ 1YwqCUoZKPIdwaeG8bMmSSJCj6Z63TR41kDp14SiHz0
-pEiqKmXfklCsAL64ixuYuREmu6xj8oLJ8oUFpVczJZ8
-> ssh-ed25519 bRHVVA r9zSY3dGdR+/f8ZP/G4G6Honz7Fr6OFpgya2h3fC7yI
-NUR+SRv86DxM7gQaaNSu9logaOCip061esHWIWadu0Q
-> ssh-ed25519 HgW9eA N+WyVrKO3Hm4NGxY7ijzCyGFvLx6gNZIDeCHwX34kgs
-UpfHyW+4fXDsr8xM9gBdchQ/6Sm33tmahGKYqyi9ZPw
--- IIHyNJ5grg3VCqXEqVvYbvN4hPQ+tMJCaAgC1LYPe2A
-Çá±ÆÝ2J'äJ®@h
-=bˆ^
6r*"<22>xŠÝA}GÕ(7Sª	>3Ð-ÃÇâìý©7	=€ôLÀËA&0¸K£'g¦Ÿ_ÂÃ´,•qo€ÞrK
ì¨döÕ;©WÕ!ú~´ Y#„çvëØjY	óÞ¬–9!ç÷e{rjI“T4+tzÝIFy,ìÚ
+-> ssh-ed25519 J/iReg s/BY6QmvQJyw7byytxef+Gn2yJyN3rmPfIta1NHilgU
+GlGlC2sMlD5svQQjksSrQza9dEa28cGD7wYp3gXTFcI
+-> ssh-ed25519 GNhSGw A2cML4zxZ39joqitQzAaije7lYjvaToP5Zaj3YDVw1U
+aepFO+b/xsBmAvJo64ZxO8ihPF15RMEyk88JgeM3RSs
+-> ssh-ed25519 eXMAtA CTjbYxyY6ske0K4EbfpjYLv70VY3b0kxWioABKrwcX8
+AiZBwK/NvbglWiimaizhRJsEA3B4CjtrVcYpg02nNuU
+-> ssh-ed25519 5hXocQ uPXgBgtW5bFLXflrJUM3JpdXXILrYqhJa4W7x5USImM
+WPEvLEyQ8uM4ChA0N3tJQnPBNrv3kDo3/0q3z7udJZ8
+-> ssh-ed25519 bRHVVA HZSGbkge3sAhNlX8dzsLhcr95bq1LMO2PtxVxK9DynE
+RyxAF90n+pmHPYwCN9qr/pnh3X7//p1b0lf9R74CD8Y
+-> ssh-ed25519 HgW9eA LcRdk02iAiRefpqdHd2qpgqqLcHhTMS67/HDmu6QO0c
+4h+iy/MaAROssZGU9pOcVFJ6RSHkOuQn50LySqu/cBw
+--- L3BAtWEG18uX2TYkDqr5BN5iF/6thH3K3YPOXUwvFAQ
+pÓ1õÅþ€¾µÇNƒ’ÚµY‘£&¡)B=Â:
ib™o7ÍÚÔ9‘2˜òs‘€móê¢·6·ë'Á.åedÁøÀjö@w¡E…ÄV<–†t™wþ¸ø	Bqn~ƒF•kmetõA÷__¹PøN
+±ø~„;HÂ±Lº¹<C2BA>#ð3ÓÌ{&a/
--- a/secrets/restic/jitsi/base-password.age
+++ b/secrets/restic/jitsi/base-password.age
--- a/secrets/restic/jitsi/base-repo.age
+++ b/secrets/restic/jitsi/base-repo.age
--- a/secrets/restic/livre/base-password.age
+++ b/secrets/restic/livre/base-password.age
--- a/secrets/restic/livre/base-repo.age
+++ b/secrets/restic/livre/base-repo.age
--- a/secrets/restic/neo/base-password.age
+++ b/secrets/restic/neo/base-password.age
--- a/secrets/restic/neo/base-repo.age
+++ b/secrets/restic/neo/base-repo.age
@ -1,33 +1,33 @@
 age-encryption.org/v1
-> ssh-ed25519 /Gpyew 9E8R5ivA+1FxHrHgKqTSfcioq7RSlFuwH0GqKMD5eCU
-jJbZTjJs4TPxvNnHRqNFYf5kE/T8wkAxMjunuMnBgY8
-> piv-p256 ewCc3w AvAl5XOLH0uB1Yv+riFC45yIv0Gy3OKsAU52BWcGOtEk
-1FO+TNSQN6xqTfCY1ylCN6/2W2vyZk9eXqUWwxn/9PY
-> piv-p256 6CL/Pw A8DpvwoZsVXEaI9qeTaTQdSgUpyUdXPvIsRAmgUytROX
-84LUcxmnodmR1201/b6JuTFgsA5Lg2N04yjG9w5M90M
-> ssh-ed25519 eOAUSg 3wQcrGYJM1q9QbL0sXSUXrsmreAdhSkwUuhIZRJwJC4
-UarLug4vPVJtN/Nr+GPncai8tlV3T7mTW0jhsKdfcGo
+-> ssh-ed25519 /Gpyew vIFRLoY0pSHXGdjHZspYH7Da8EJVLZSPjqN1dlWAJX8
+g6wtbFQEem5VCNf0ALqeNAJ1sAuLVRvzroinIuDM1ng
+-> piv-p256 ewCc3w A1d9UW/wacw1HF+8r7rVl7xUGCL8/ccZLiKMhLXhlOgX
+zJ6m8ftB12jAptJbHxgg60yMjI2vVymNVrhVuRBZ14A
+-> piv-p256 6CL/Pw AqIAnuiylRPEpjJ2+ht0UX0LdDow4j4PXWzslDQdq6pr
+2z7UYNiU/Kzb5GyoOWTU3Xpyv0G1yTmz4TBij2R8Q1g
+-> ssh-ed25519 eOAUSg zaw1C5OKDmIMDatfxMFhuqzEiQniV1gr7KpC2EY3i0A
+SuyMbAxoA77fLLIzpJvWIUAy2K/E0a9zxFxqjtS4ZGo
 -> ssh-rsa REaZBA
-HBAf8/CX6UnfWAcOS8VacVBKYXfnthPo6T0gjQQ5c9Ef+Xn+gCo1XZ+lZWZKHKin
-aZ0MQYgUAq/q8dIsrJoD1RrVIHDxnpnS6D0SeiNZ0DKlm3j3PVwMPiVfWGygTOJR
-QFFSijGd92ifTEgVnIgTHt8gAPEFEna8bKjk5PTqK+MkeaGqKfYhpYWu9NQZWyhJ
-LN1dFwTfyjg4ipbQN4uDg/hrvMcYQpWsTIRFRFc1oiJ6ZWDC1w8JO9+UHt468X57
-tEsJdc6sDPTdM7tqbe18PUcsJsyu/jhqwwtIz5yeXH4ZWeaUPzX1FdPChO6S9uAy
-Lw9roZ6Hn0ESHpO/dNg8NHs2LQ1CYIBGMY0aHbbQlp1y9nTKjIXraHHKa88L2DgQ
-8IIplDo8BS3fHGSgqgOnossfPZ5qZNcNXdQOIcgDMYJQjI879fW2iMYR3bFBHcWC
-2jNrd0CuuM6eOstYVb4fA4h6q7yPjXZqjpSEyqACYYcoCiUfc0F8IhjqeomlPxmS
+g5/AsQTjPk/N6qzXNffBJ8xH61nSKsGFsgs2dVmjwBnWgPPrD2L7eFCKkVeEy5uM
+aFgWTk51nZY7VpbibwH/mRjhZrQNkvtsFUvfGDQANPGXy1lhk3upq43iLGbf8IcC
+qOG0/fWgvXWpkf6ZPnp2ahy5E60SKU695uBE0rNZRX8n9tX/njAFq2rASU2WS9H9
+w9Ld3bIpm7U77EMljQ7sYaP8dszd3CkMoi3MtH5rnzBlSH/ifyohQrOhfmhNZHU6
+kEjlTwRa760i5yM431hyXkWs1MkMn13rh134fTkxg8kI7pdojKt4H91WiwhVABap
+285hVF+OXglRJI7jqw267H2M7UvGWqgFMFkXpTBn/Ds9aFsyF8C4JaMVV/zT9oqG
+3xtP0SJaay0hOiUSz4thRox7CdOv799W2rqQGLXScky4ll5es1CX/YlLQr7eIemg
+SDUhr1VWEpTs7+1rut7F8AV9AEppuy+k+QSRcw0+ms76i7OoDH6nYQlexiZ2BcKD

-> ssh-ed25519 J/iReg SmY4dKBOn2WlvEiqrcKSCIJ5iadd1TKj6PVE4V7Xk1A
-a6aOv9wg+ZFbKMjtY2T7VR9gLsP4IggBVQrI190D2Sw
-> ssh-ed25519 GNhSGw WOrOlGz1i8Z3JIzGh7Kyr+jjjNgSRwOe4+H0zjrZnTo
-iUjbsPUVGfOuMP/1SCGEWNxwSzrbz114qiurneDUrbU
-> ssh-ed25519 eXMAtA neOjCoQY99JUhYNTcdKSaS8WQ4jOuf8FYQ+iK7ANUHc
-7W+eN95/pFXXVVoDMpsWkvlcfp5ooVZdBSljMsRzPu8
-> ssh-ed25519 5hXocQ 1pYDKMg1S1vWCGS0ZyHT4kAUjnx5bKFVShc92jvInyw
-tWm3gLLPMBc/NSJFsK29iuhDML88zwYCobjOjxD/eF0
-> ssh-ed25519 bRHVVA WnaaxBcPsTxTXWcYEV2rsvYNNHD7jMFSrN/WxDp1hT0
-e67ND6scrW/8PSptTAHWt/4L5QJ2Knh5YDrg22OBogU
-> ssh-ed25519 HgW9eA 47hf38POCWm5hH4WTA+gdeItJihq7y3aYjD+/4CGsXA
-W1oAnxdm5tiJf614NujTsVhw0hyfKvo3ZCuQJlzX2Dk
--- rXhzOxAysWwshO27q9dOIBE7M95v+/xEkWCqG4O87tc
-++yûÝ²#|gld¼Ü	<09>!·Èmæ2ª‹½<E280B9>ƒB¬|ú¼*-ÕëÄê³…
º2U!z›!ùµ0›ó	àxàTÇM/Nü©Ú{%ÂÖ½ó<C2BD>Ùªo¯ù œß²ìHV…^…Ï‹uê£LŽ“ùò¾¢–B<E28093>&‰û¡™€y%<25>YN²¹
+-> ssh-ed25519 J/iReg eCJHHRqu4yJ41OVqFMQ0419+1xE8OcfBoAcpGADfPVQ
+W5jmItUpU1crfgtYWAsZdfG/dnfhjQNdt52Q0e9+0IY
+-> ssh-ed25519 GNhSGw 92SxscpXn08/+5hgGH2txZYpxMyTCE6QzArd4bTQngc
+eQOgfzMsCFqjCJyYfAgFTVexlU9av/z71tDNL/cbYRA
+-> ssh-ed25519 eXMAtA JUzYhH9ARtKFnGd9d03qcoQZVWaxFESyZaLbJT3wVwM
+vnXBLbUz940rJbloFHSIg5KE7miFXEq6fKKyO67rtjM
+-> ssh-ed25519 5hXocQ 5OrWn5S0Dv6QZZ4Bp3v4053fbBmsHGcUetEWa+mvN2Q
+iktdo27wqYf/FE98g59p3Zn9Zda2AEwxkd0BcW/Cqcg
+-> ssh-ed25519 bRHVVA cYYvtFox+AR6FqufobXxiFV8u1+9LUYxXGxa+RzhRHk
+v6VuMLViqatipD1pKZR15zr2q9RcqFU/8pvO5eS0370
+-> ssh-ed25519 HgW9eA YJZAg4EgtmCw6nDI+3Baux2KoWqMLPg21YFlTgXds34
+MazzyiN93lrniBSnxMmKRGuS2Xae56BFI8jdWT79EEU
+--- 9tBGnFdPK/K8RLNEZ3gxod0tzbf3KqshC74lDb1M/js
+bô{6Î¢—íéÅ9ƒH»)‹n¬¹jdlk/ýi(?ÖàÆ´“ìr—lƒSÝá’äªîÛ<C3AE>¢¯Ó.‡Eõß	¸£NÕ‘qâVuö1ãz)$9RŒ£+SÑ89J‚Jò6„þCpù±-dÜÚ£É˜lsvìÚ/º^ËnÓå›IU73$|
--- a/secrets/restic/nextcloud/base-password.age
+++ b/secrets/restic/nextcloud/base-password.age
@ -1,34 +1,34 @@
 age-encryption.org/v1
-> ssh-ed25519 APVFfA dhVYYldUuKV4CkU1URqKjJTYjN8+0kDLkWCl6Fbjxnw
-lsAsrcPJ6FUEiuknql50udQ+MxguUPBpG1VtEhp/6/U
-> piv-p256 ewCc3w Ahgj806GejdrnCqC8KyYykz9k2fgHQaUTo4cs2dMg8dV
-DfiXUeRe2Z+XpeJuQuT/cZosVbJELCuazn+lverFD7Q
-> piv-p256 6CL/Pw AkmKUuF6xuzd6miCfSeoNnUbror2DdD3PjTYR0hdk7QD
-hkl2GYQa02A79xI5TKFSyJg5vHYmeNEdh7Hu02JNeIM
-> ssh-ed25519 eOAUSg IWVGznF6ym2vmCJNrz1lwZYhGZK0ExgZM0hVUuabREU
-CnnVjOviLCtN9YRNuG9yEME0tc/SlHWf0Pd91xLFSAs
+-> ssh-ed25519 APVFfA thK758cqteGYd3zvMWNtQvBMIxWrFNqTyhFycMZ14kc
+0Y6eYrMGHCg3jP2xVwE8gQQEUYgrKvmW1CRK/8HrCT4
+-> piv-p256 ewCc3w A+Mcz+JbARKxXBPs64/fRY+zxE6uuOZJru86yS0wXLbY
+1sX5108tQQ1UAE6aoMR0NnYmd2LK7OT6wnw1TKmPBvc
+-> piv-p256 6CL/Pw A0GorBRF12nh2obMr+RHCcUQNAEQeUc4IO1rPBZdgmLM
+CJ5NONPMr9YUb0n2qhWQvk+xLSd62v1NPe+5I2HBGho
+-> ssh-ed25519 eOAUSg qMOCl4QKSHIZ4/+5zH5M6XogMUTV3QSELKPQM4j1gS4
+7zwUp6H6amlLbWIcOga98zKVlSCPlny/DF5VFhfO19I
 -> ssh-rsa REaZBA
-RFfmDFkjZaWNmTYe9wtzur9LY4UikSC76T+PjSyGOu/eFps1UHmf/YDXYbR2uSf6
-xaVnkvleuPQPySYk+v9dxUU3PyC0DyaALrEdWIA3hvaDrbV6e3KdLFX7PiQvqOxv
-w9yjMxOc79EPj5XuuxySm2mzzyVuJ1+ajmg4GQT2DQH1C86ASGoU8ZXUgXFb5oca
-Q/emrQxYwT6q2LgJ50fUtcZ8qYuf5MhwFIwucvFRWg8Poz1yiWqk1GmVuXVb0Yer
-HoeiV/H3fAOBvDldgMroT5PGJlLhebj70bSR9wFYIc3Jgy7OQt8ZQhPmAxYhpotR
-BoXZ31NrZ9LVBKs6q7luMDyOU2byvplDUSSs5LIsT+jgCMdvXEgfBCnbupsbGQUw
-Buh/npgrWBrm1mYgX4c8IhiprzSatZhVMmZeKMXsGpU98e2dmmdeNGuN6mluVqMs
-hNYuaaSjeQ0M8TMa9/XFCLsqBTnodDJOFTM7GupdoYXfRkAUx5v7BAJASYPaOtLg
+eLuxDG6bAuzuEWyuFNyon7/D8McmXvVQbB4DUnCO1r2OXavIvfMbWhwcNT+wI/Iw
+RJ58kwvk0rpQxl9LIzxs2e6WOAXverlW8ZWcMytr3kYonbfvvyKIYSHeQFG0B8aY
+QZkZkmt8lyYXng81KJDY++5ti8jyUlVOgVd0yreNWbGjwOdFVqd23C0g+SfDkb5t
+0VvxqeoPVzEgMIHnRccUuCbOSPbX9w5cU78aG1CNkuevY+UVGQhmqi8fKyA7+Cx8
+tgR0AbF+CwGyMg7B/15OIKKLVYKxJj7E4aOf6osLKpaLrtKGmfeYcNbwLb0f3+dL
+if2AGJHeGcSCufplrUmAJTHjLP+ZVoD0jv9Tg731oJ+lsmJwqkQKvvbu6GyodjFF
+RW6Choj5uZC89NIjCleIeV8N5VrRvMP7gyn0nPJm1EHKfSjz88492m379KUuvVOh
+wFfVW2OqIziYuje3iPT6yHBOWj3MUBFfNuZmUOaH/IEQzpnXsOMp+5NR19sdxzIt

-> ssh-ed25519 J/iReg +Rk2RSzik7zDnt1yE0BumXYB6bGjUfPPt2fd4vQGUzk
-OgoQ0uCxmLjO9MFcnVs8AqEW7H+Odd6AFyr5yL37ODM
-> ssh-ed25519 GNhSGw Z+hEjpgpL1w2ZrrfGdekFfBXW/mvm8NP16AhdcVRYFc
-9FXhi8Cb5mKwfhTUWNxt+fqIjT5XXB4wYeB5WrIAM4E
-> ssh-ed25519 eXMAtA fcaFAau7FXOTNuqMdbmeLSZMgRAB+hsjRchxEOuT0nc
-ya4JC9zrXfSw3XsvAV3mrfbj7BYXQwz1RCokloUb22w
-> ssh-ed25519 5hXocQ TW+NVIXSvcTZFoVFTdpgUdKTeF/gx83KwJC1N81jHCo
-+n3/QMNTW3fLa3NDxOJaVi5Jsc1Pc+GVHg3VZzijl4M
-> ssh-ed25519 bRHVVA OOMtsBuGdeBzCtSXTr/QFnZI1lKlggJvPLDQlab5+Sc
-GtXjEk/CQpx3tXVoXXiiIDRSXbcqLwEJKSA1IxdL/As
-> ssh-ed25519 HgW9eA tRymk/is62+yG7Uq/IdiVMAXO29EweLxJ6hDKHmfjRc
-6vBTqfiTSqWyS4n3NVOlv5QlF1QoCAp8FQV1DVC1jpc
--- yL9V0rPZ32TrFV362q1kQ23XT17RbMPz3pR941xpkaI
-ÒìÅwÍï`£çîèÓ›v£ÜŸ$Ú{DøßµHK‹R™¡Út—ç²Kê|©þ1u>ØÄ*
º,ÄKwãÒø<C392>ˆ‚;ˆùy<aë²”iB<0E>aÄè“$ß•nySR¡sS\Y2ñðµ<C3B0>æuŽKÙ»GUÎÊ)Üg5!‰«:Îó¥w"³
-³áÕp%“‡ÏRXóñÇUz\5ôççZÿß„‘!2æÀ™<16>}Ì‡–eà”t]Ä=²¶¦ç	„´7><3E>^¨3\Ù¡˜ŽMQà“!è1WžSgÔã|Í'êÅ$”Y¸d¾r	ì¡LP¦}!z×höKìv¡yi¥;›b¦‡€io¨œ®Ròø®Ç¬¼ÃŸi÷PßafÓ³™¯pŠ
+-> ssh-ed25519 J/iReg PCqqUqmX7JPIqt26nsiv4/4Le0Zzw8RK46Muv5qC8GY
+6q2oxmxLrdQRyAiKuErml/xIook6Nbx5BMCeNFaCjug
+-> ssh-ed25519 GNhSGw IRjxeqzzzvVSRIcYhOhZkejiOCq9l3P1sYltk/xiYlI
+xRBgaNMBXZiO5aYZn/L/AKFnbiuu3hlDkYV2MkcUA7I
+-> ssh-ed25519 eXMAtA jH6fgmKMhBMyQ4pctjKVG41n8cJnvUqOw9MynaKP1Xs
+tC8yehDvgjIKaM62tn3gld7nzlhvwe/p2t8qJjhil08
+-> ssh-ed25519 5hXocQ 9eyLU1e3EHBiIlMEaQOov6MbNLmaz7SEgUhzRwj1X2M
+GEWLNNYhMmypcHt4juzTME2bcAQ12iy6tTqZQCKE1v4
+-> ssh-ed25519 bRHVVA qB6dlW+Q16DE+bwovrMU9lPjNowzACsStvy8Q1nZ9Fs
+GyQwVn71mlzJvDznW7jmbbjlMnc0H4jG2+gMfJawhJo
+-> ssh-ed25519 HgW9eA oU8JTkoAH3yMOLcf3aKZ2RT7TtGgO0KlMLB2/hXzPXo
+Oy8RdMThUlvU5mB+T+zlVBGpMgjwVBo6kU8Y7pekdqk
+--- xzdtbFSZNHcOxsvALmpt5SWVTxrkvKeaZF2x2gEpHf4
+ÓTõÄ—_Î£
³{ÚDE8 hºè/C•ô¢t`3G½¶Ä»sö:I$Üõñ.7r6 œí@w3u9ß=§j‹n{úÿL<C3BF>ý<EFBFBD>¼ð¤ºx¸æºNŽ—µP´—‹“5¦ü'Ça„œêð,RPžÉ2Õ=v¿ûšd1s¼l¯ôctÎo	&m‰6¤´|“0/×?<3F>
+ÀÙ™vö)˜!9lbxMtwê©ûÕ•ëg8<67>ý9`cNÕKZ<¥dÇâv%];-È{djµþóŽúQáuùÆ	 ö‚¾!<21>-{a{’®ª‰ˆáŠBç0¢Ö1xœM]äMó†IÚô&JÒÛÛM2çRùºš©:½F½j/A÷ÆRbÚ=ZF;OmN<6D>îµÌ¯md/
--- a/secrets/restic/nextcloud/base-repo.age
+++ b/secrets/restic/nextcloud/base-repo.age
--- a/secrets/restic/periodique/base-password.age
+++ b/secrets/restic/periodique/base-password.age
--- a/secrets/restic/periodique/base-repo.age
+++ b/secrets/restic/periodique/base-repo.age
--- a/secrets/restic/redite/base-password.age
+++ b/secrets/restic/redite/base-password.age
--- a/secrets/restic/redite/base-repo.age
+++ b/secrets/restic/redite/base-repo.age
@ -1,35 +1,33 @@
 age-encryption.org/v1
-<EFBFBD>
-<EFBFBD>
-<EFBFBD>
-<EFBFBD>
-<EFBFBD>
-<EFBFBD>
-<EFBFBD>
-<EFBFBD>
+-> ssh-ed25519 hTlmJA FnbZzrcGe8xckj583o7CDx7Gil5EjS7R333f1MTGDQQ
+sGUiPc06MhjmKk7ZLk9Gq0gYYufZWwk2NlmNeE8t4SM
+-> piv-p256 ewCc3w A+XJ7GRL73rIcMB0bljxvbtOg82ss7EWMVPLgL7+VdTC
+H2i6v/HxWS3MsJ/pl5MH8oTdjsCXr5zbpK1RWGtWhzs
+-> piv-p256 6CL/Pw AnOGrmn6941GPSjMACEPYXa93KGF9B4QsjCiQa/mRk0R
+6vRp2PjdBd7ieXl1RcjIWHA4s6vpp3UHYeA9qt3q/Wc
+-> ssh-ed25519 eOAUSg 03OtZscLFM0KdTwGBGZpPbJLXMGZTsHGTC8twJg/Znk
+5DlvRlPf3/+LqUeoxCDuM3v8e2eUjEXv9MwVlZULVPI
 -> ssh-rsa REaZBA
-<EFBFBD>
-<EFBFBD>
-<EFBFBD>
-<EFBFBD>
-<EFBFBD>
-<EFBFBD>
-<EFBFBD>
-<EFBFBD>
+BjpRz/MNhGsd/eWvNuGg2ti6hZQGt5t08sh+KJNtL8Hp9FBvyIMyixOePNUKGop3
+waar46x2Bmxjv7U9Z4Cfaps/dU0zXqACsSDBkFF63XzDMUTSIg4jZk7PEUOhi5mZ
+2bYp+p0/zbOI598Tdy4EbCgFKVloSEV0VfYHi5qcPnVV9T2wZ5ImWOZKvTDJi3/r
+c/RNYzqFVkVCtLBm9se/pzhjMGlMI1HMUIV9hjNkCFEABbW/7mMOkIzHny699kCE
+Oxs8OvUK7QXh1DPKZgG1ai84neLcBCTf8jXMxMdRQehMN+GpQWetQwv25T4Xol3r
+DwsfioMAOhY4v6bizYr5pWmQBG0FeOLbcQyxPv0oJxtr1Mm8BYFyrZSLJfEW/EZY
+tLsyL94ao0ytoIM4dv2vQYg6YwPHsQNgs9ORlHKO4j6SHZfycDwyCYzJKfXd3MUX
+YDUm7CLsm+n+3Z3ztl9r3GUyYfdmA8lc78hR5CiyyWRneZorBdnafij2xwAVf8mC

-<EFBFBD>
-<EFBFBD>
-<EFBFBD>
-<EFBFBD>
-<EFBFBD>
-<EFBFBD>
-<EFBFBD>
-<EFBFBD>
-<EFBFBD>
-<EFBFBD>
-<EFBFBD>
-<EFBFBD>
-<EFBFBD>
-<EFBFBD>
-<EFBFBD>
-<EFBFBD>
+-> ssh-ed25519 J/iReg xxzb8jLUNR4BK3GX9bFEo209ewsozfpSe5ofW/SOQns
+6xBKSd3hXL3nUAMyupXOAvdBPN3CtSn/XGQ9WQdKcW0
+-> ssh-ed25519 GNhSGw eI+BsylNibH2K5GaaFA7faxw7/t9h+ZmAduxDKSAuTs
+6M73oR+y51l/kT8zC4or7Mrg9kPfZmDRGEPsVUPXCMA
+-> ssh-ed25519 eXMAtA tNl+ZSU1/GbHvCNrBK4N5AAwDNlGX5Hjc8FM4xrKBio
+unvC8SG3CA1C4n1HjH/HYVhgtnsWgFWetCMZa+XJWsQ
+-> ssh-ed25519 5hXocQ z5+LFM4PQcP5ni+JmNx+7H011+g/IA2DSTbDfcQWUjY
+WtYawH6xEp3mVp4391LxyN/EJ7RkDF8yCUeVS3g01+s
+-> ssh-ed25519 bRHVVA KbpqkTUR3TytHVkJpApFPBjXJBZNbNIA5RuLdbAvYwU
+y8vbDYyX7rSOU7uCkd9PJVbWiqzgcRUyVfHPYVwxagQ
+-> ssh-ed25519 HgW9eA GC+g/FOXyXEOh3478KK/aLwspik4glZ+Ld0Vis6TsSE
+SEmGnzgTLPrXJvoyO3FuqvyrsWKExqpDL44Yk4IKFC0
+--- wRfsT0vnpqFA5KM2gRjHY/JvTWrI5ezjAW059UrUh8I
+7—ÌåcÆxòËÕû™~l,²hcv³œŠ{V½°<<3C>$ÐÖ²'ØlH’ð#À§«=<3D>Ð'-(í·–ÚÝ'~¼[ò:ç…ç–l/qÞ‹Î¦år<¾Yt”›<E2809D>/±}€¤ÎôZIzº)ÆCq€ùáY5Õ¨4| röå–©p<Ñ°¿)zãgßqY~‰(
--- a/secrets/restic/reverseproxy/base-password.age
+++ b/secrets/restic/reverseproxy/base-password.age
--- a/secrets/restic/reverseproxy/base-repo.age
+++ b/secrets/restic/reverseproxy/base-repo.age
--- a/secrets/restic/two/base-password.age
+++ b/secrets/restic/two/base-password.age
--- a/secrets/restic/two/base-repo.age
+++ b/secrets/restic/two/base-repo.age
@ -1,33 +1,34 @@
 age-encryption.org/v1
-> ssh-ed25519 qeMkwQ NKP2RUhBiBJvgeir3w5SdZvMTtewZr8ZaQ4fnFlvqDk
-9Qm7F4Fsr8FdCKH1hFfQAUZVJM5AghrI3bkC63e7lA4
-> piv-p256 ewCc3w A+RbLTktyUPlHfY7CKm878dHfgFHvx7f/ITKKm8q+gBR
-ImkH2oI+KnEYGKl9B5f6nTzrpmp++Y9UbcrsxrxKZsQ
-> piv-p256 6CL/Pw AqPlAqiRJ7YzztIxZJ/MG4lllphpONbSpaxwkJWSHp/e
-z4cjfWYZ+V7hnLi8aZOZc01Jcrvf2ovElu1I99xHrhM
-> ssh-ed25519 eOAUSg ZqhcAfvlMRAAgFqemzSphx9MaivnWYadvSJc8LhuGyQ
-NEsXht+MOG//fe6AGDtIDI/gPPcOVk/FUe34cxSyjC4
+-> ssh-ed25519 qeMkwQ V0BxlrRgwfc0IhJ3Gbovpsbj5qZRXAYzHzqidP+eXUs
+DykTgdPS1J4YvS60Q/l15/JFm8RDTlzb8UD8jn0HFDk
+-> piv-p256 ewCc3w AkDTlA5jU8ZVK/oi9N+wHT8EdpbOGmQRGlLrg+szM5qM
+1A6vLc9JkHkM6Xmxg8nmv6D0AJeWlAWNuwU8yfAepM8
+-> piv-p256 6CL/Pw A0HusuRZruWqVc62lew3s9UHIxduAYBYx8oqahKFzTU1
+C5Kv368gKFgKROusXUA+YcD9KBwlirrwLUsHsHB3U0o
+-> ssh-ed25519 eOAUSg DlDj699HyPGCL1OQAYcYVFdLpAApq+KbLByfdEdjZUo
+HDCoB7ZqYDSnVshgplFR5Hrcuq0qjwUG1IxUpmy6jXE
 -> ssh-rsa REaZBA
-cpNHQ3JzoJw67RTi8O8tIuXTrs5ZEdoN7GzwYHfKz77qipK9noCZ7YzR/xQTvwsr
-pe8kzOj/9ojtr7dfEFr9oei9R/WhQpyJmXo5XAV3/7O/06H2uR6GBb7j70mOIFl+
-0dlkOKN6Qd1JC3fStSPxVzLNlMZkDfwEkqQdXeJXExEntcDYKpkhnui1RCOVjN5m
-oDWCU4+xobDT5GXN5Q4UpcgkvFwV74t6Qkb/u38wSWZPjFFmdJ7z3FUmC/rzntMd
-Fv3CoIRoCHDv1GOFwK1weLDXncHzegg9GM34KkuqTlijKqGcUnMbjrGEIlip5mof
-QwMGWA0wDIzzsXk168OU7g2Dn8HfEnlmjKAWMDgOz0xza+Yk4ulcKGTQJPZ8nQSt
-D5kO273R+AZVfuK4q8Noelwk+kN9NI7x0fm01VrRgHzH/L4m3NxsfBBf7wlOwjHN
-fKQmxDEE6iUb8GPfgoYNT5JmeXjcxTVGqrLEFgsQyBmf60CaTEiyXmYARHzu+KXn
+cf1hyQ6c0fjcmMIeg1bzhw5pg/RlG3s7CSxBj/rPdMTyg7M6oJRSysw25PSs2MlA
+5mNY8DZaEphwpX2aG3ylpY5AfMcGho9az/3uFUs9ZEj+tD3Fwka4M1psbJ3Whj+S
+jmCkJt9QlojQoCKRobgARsV3K8TXoYG1Ldp6ZIs7m6VKSXlcLVNdcVlybohqWD4g
+e8LW1JumCGg0qXq6k54NnwuwSzaaqsBSI4IqCwFAMLUzK1OZOFrgm03l95GmURoH
+zMjNKkYsDL5eYvNnBqNY9Ic7NZFFQDaTUlKqXuUj1Y0WYQ5yGadso4r+jKM8tG/
+zaoHJ/eTxKz81V7Sl5QG52yrlXExnKieoGhy1ZIN1Tzp5qWLvXF23KvV5erMYx9Z
+TQbSxAd6YF30DWNnsdj7H2CLyhp7xXB5HiEKszrT6AZSkRdZp02ynBuDZQpGi9a6
+ogkX3vUmCCLh0ilCj5iTm9bPshU8h2ah+hysyKCEW6uOKYFi6jxpkNj2atrfJjt6

-> ssh-ed25519 J/iReg 1+Ap42RbP3acr7Ka+qw+aVEv1d7WskyqkNieme0bAEk
-ui2uJ3M+L0G0TyKuEV/IhzpYXaxF1O1aagqj3Kx/7EI
-> ssh-ed25519 GNhSGw Ac5WUe27UeSG8N6jY+wTLVxg39TOHj2ofTPEQ8J+50M
-lirLvQJ6uLJ6iqbgRXRMcraPCI/qX5bU7VolihDCKSY
-> ssh-ed25519 eXMAtA 9LUBaGZfAXTwSUtRFzMQ+VnWU8Bfm4Vr7ANnTYKiDn4
-gdW6VKHByq15GkGGQ4sVqdUnMdF54KmH1+VrXhnmY+k
-> ssh-ed25519 5hXocQ Y02v/mKTB7LUZ09hIbg9QZpXBX8gYLqnQgyI1pbDSVg
-yOOI+/5HJHEeHa5yMi6aBMk75ISwa9Xw9HJalZ/rqTI
-> ssh-ed25519 bRHVVA HgDF3J/p8t71Rb/wH9h490WgNrTF/Na+yCsLTkschHU
-CAMpJ+aE3sCiakjuEDWZTeNiUQcRbDc/OEUeaAaicuY
-> ssh-ed25519 HgW9eA FZRwYTkkTqaZKYie1ghT4KHVaN9HotPX8K0h4rktyAY
-fCcmP82VGbpAvjkfTdqn4M1VIkDWKmLa4X++YRoZVR8
--- hOQJKXW3O/fPqp4YCsrX8etojiHqM/lXZhPMSl4bBAU
-¾)Gbèæ°¡è¬ûF?ÍSŽnù¸¹¹å\Ø…h¬°TX¨åùo9»„°·rûVÖ.“ÝjF\òróBøÌoøBª+ÑFmYÂ!4Úl›Ú	HÛæü>±£<C2B1>¡*y¡Èg8 îéGtuš_)óÖ›aRš9àUîÛæ÷Ás
+-> ssh-ed25519 J/iReg cAlWGn4BaIgKEGgiB+2kdNLrz2C0W8XlUUCEtS3pCC0
+hgovrzFaPgOyJc4kvJnWSAUlHRzc51+l3E5gNrmjvks
+-> ssh-ed25519 GNhSGw vqj8Bao0cAUka5rZK+vttj9k4X24dP74VQUXW4DWM1Y
+3qP0OrK258NQ0ojPE6NesygGrHMLOptPSBHjN0I5y70
+-> ssh-ed25519 eXMAtA DFA/+SnUpHgj2SpoaqhWW/V3suM0rhQJAzvuczHMU2I
+/S8e4b4hJ4/lHqk58qfyrkGhSg73P6OuSQdOFfLvBB4
+-> ssh-ed25519 5hXocQ 8LUNxiu9MM/WWnPs7tn6+ECZALHtzp80rrVJ28dUkzg
+kpXfqf5gaSYX93zCOkMIXMxfWNhZvyHzY6Y3c916xw
+-> ssh-ed25519 bRHVVA 2oMUBGKn7UfkmzsA/+ruJ+HWN07dUuV7uLrvjxDUuSs
+/iQS7SjgCeCyO7qqf6AJYDjgMwtDR07Qr/MyKGa7W6w
+-> ssh-ed25519 HgW9eA O7p0TohnEmP0RP1TxtM+ibqLndhqnvNuLTzvMBcpKn8
+l+CH8zgsEp1Y2sqKisI8W1opwoAfrKbE/ybJE234vfo
+--- 0+uU075VueLf/ffsura7EKitAf8UedN7VRpBPaDF08k
+6%Q¦6¤‹i±
+K<>íW]ÿÉÇJxÇ[Y¿!<21>*4Z»Ž¯7$Faúù5Ô¢ÿª¾l¡ßÔÖc~Xc˜Hã¤o;B<ä©rn`Ìîä±Œ0¬ù÷V 
ÃE‹ôÙ¹Î<C2B9>}8Æ›¥D˜aÊJ<C38A>3Ä¾è¶€òƒXŸÓIeâÀG
--- a/secrets/restic/vaultwarden/base-password.age
+++ b/secrets/restic/vaultwarden/base-password.age
--- a/secrets/restic/vaultwarden/base-repo.age
+++ b/secrets/restic/vaultwarden/base-repo.age
@ -1,35 +1,34 @@
 age-encryption.org/v1
-> ssh-ed25519 TqxOLw HxPs1ZpxbF35NKUhWIe3/hLrPMBGGmOZRcrX9J91pQg
-a/mAxbN87L99xGFqATCs6mF7VeMKGm68KETpIHiFp5s
-> piv-p256 ewCc3w Ax0YtgwoHIh9VCyEkJJ2KQvXdI10IKqrhSX9POzD7Ko4
-aR0EYtkLz32KsShR1DnN/1aosogtpdeAYGyxoSvgvP8
-> piv-p256 6CL/Pw A+KhLAMZu8zX7eZu3EavQmSH6qQ9Jzm7Cs1LbT4jZ4co
-hY2GbvxgwIFeWSbZBcBOGkaRwsUcARZEUf/74iTTido
-> ssh-ed25519 eOAUSg B1reebReDZP5iY+4JLngiPAXR4qFXP7IGYSX7tADd2Q
-r+tdKm55iVz92Br97r7vaqIOuNFA8aoX7t+uh7NU0T8
+-> ssh-ed25519 TqxOLw m7ce2jpwWj58Kjno0mswFfOS02EwJ+bkJyv2Srj3hnI
+REgPtnTeZQTnLXbYs4O+caEjmCaX9Zlzlz6lN8fiNuc
+-> piv-p256 ewCc3w A/KHcLtYfYoXmPVVIk8C37h1S3BdShwH+nFRi9ZSNdKw
+sfHJH3/zHhKuteaD9qdmIVokJ9XSDQvfuUtK0MFrwug
+-> piv-p256 6CL/Pw AlSGBE7UQ5qBbbpPEpNIJRGDf7I0gi0cJpqTla05SniQ
+mp6Ez4tuexbbbVMKH7SO1VwyrFDLa6n9X8cg3QP0W2s
+-> ssh-ed25519 eOAUSg BfcE7Z5qtPPuldnqC8qtSGRO1EYxnhdF7/VWv0gqGy0
+B4zrCqxBGbMJ7gf4TOzdXfcEZOvJfCPT8svpq8bd+7M
 -> ssh-rsa REaZBA
-X2wujw8z2rxBGpW4Ga5AURittSxCMqgXY75Dh9Hm0w9FRqcObyxya8c7kPaiQ/yH
-XiMmRi/r/5V9WNQiRxoOceK2nj4qqHf/1JoIwaeUXpGgreEgOj4Q0XuJOvjDzr3F
-ZnTX2h5O3uRJ/wS/Ny/a6D3VCCCiv6dd9rDsNy/N+hMs6/LNrAFYSKL7u0pUsqqF
-qsz2mdOXWOO6vVs+0MObmK2LKuxqjkDL8nxd1HJBXoDkGUXe/37ouVLShMj6bhaO
-ysrlwOooB5JuXk8hIXJqxA9jxpguBT34ejIK0WszirhkxIStBs+hqW2zDKBE4q6M
-+Yy71KHA/QOZzCe3c+DXWmjJaqCYG1FPm1kA+0+fQyqeEkZumr7cTIBD4qAclsSS
-6NdN0qdzyQkMQHPfTmRQiwrknwN/DdsYqyEzdchqLsPOxsYQ6odcWvHDfIHH4M9H
-uf1dgg9v6ttw0QXNozKvRtNxRE+QDru7eLitUeq1v4CTIPGyMphLVoyQY43JRobA
+MbK9qV5j6wlbpYerW1ManSzVMRzS7dU0YEyTNJKIFhL/bJyTUXRHX/ZlpJOqW2lL
+LuBL0FkJoDhltHRQkcGZB1jcfOg+FyCdegYVgA+rqrm9UBNCvPSM1Q0MvBjI/9qW
+vjdk72jqGpuA85yGRXPVClbfBBkxa7c+RB9wSLGqreDCkRUPJZTFs6YkeDPwQ9Hl
+CV3+uzNKop6AtV2EaYWWTiuQdEzLkAX3tqAOyF6IV5+FGwbegHZsM9WMTzb8U9lK
+5aJCle80A1ZdZ8sp5b8LCU7g9ictxdqRaZDSDK+E1HYjE8HGpV06UllmqICCxnws
++8Zvy8JXqRTTNXRMvdT8oFmuIuU+14hnl0LYs1zPxum7oBdWd/ua6wXK876epla
+uOec9cPnB75pyCFerjvmKWVhZNrN4Xm67LeFnVHKLZRnxhmIUt+p/ymioe18Lw1O
+gC/9/W1z2nkhVip1vujqOKDiRk+bQKimMFg+bK3zDueSZieUL6WjEBo1Z+uFfNKo

-> ssh-ed25519 J/iReg atWI5s6s5lkAGVXDNc7YDPTb97VpE3wJ32Y1tJsuG2o
-9PmzHpKpi/tyo/sS2GZ3EV6IXJeDwcEN8k0dbAZPdNs
-> ssh-ed25519 GNhSGw jCI3sAFB+L7nRH5ZanXmEV4WcTzkg5FIG2zZ+RfFdU4
-PiOxOyvh5Yjn+0GccBvLbx70r5/iz7RX07oH08AjV9M
-> ssh-ed25519 eXMAtA TJAE6sgc0h1Mha2ovPo6wDraYZJt1nXeC7enPdrD9gM
-6nsfkO1miRQ9CHER+9+50FMnWXZcHJn5Df0mdm/Jqtk
-> ssh-ed25519 5hXocQ QeiM2nJPuK0C0DjItmbcyqZREAZNCssEK4FB6iDCP1c
-FN06in3frZKPRryr4fXLg2ADnL78LfDwICpRQxbFzR0
-> ssh-ed25519 bRHVVA GptyRxuEIhoVhk4Hf+1GLyxCZ99voSySK9BoOibIciI
-AuGAHBNe74E2yXK4RCGtg25qs79pIn0We1SIRLiKsmY
-> ssh-ed25519 HgW9eA MzYn4yOhJju1gDVYfRB3zU1q8UNSeUGAfYdo6DKwuTA
-XaJ/q4c9og3oloPCAXG2UUhz0zLDYwhaub3sS7qFZDY
--- FuySxtZTuihnVC0xv92VNQdbbH4/M4M/EvXg/hRQi2k
-ïùè±ó ~{µ¸Ã¢”Lë%Ã—·PéJË]ˆwßFFÇÔl»
-o…GÄ
-›æ”Â”Cã®Û¼1±
,<2C>[Á÷f'‰<>ÚBô÷¶ÆbrO¡ÌRX²Êö±›þôÿçOÂ:ÌŸ4¼Ý{c¸By—XD¯ðRü,ÿvƒ+K`º<1C>e3ÈˆVŽ3î6É¢}1˜¦»˜ªa
+-> ssh-ed25519 J/iReg 9HhP0rRxPhVYYUbMp9RmB/70paCCOZzMXbiC59rZzQ4
+4Rnwk8dZPyACOXgFHegbulbfYomTR9ymftYJPpi5IhE
+-> ssh-ed25519 GNhSGw eB24dkkTe/5IHnkc2HDoEQ4ne3Kt6Gk10ANNOiTmBhg
+qg0djg9oQNsyJqtJFrDU5w0ggNPHvasqcuScf1Tmuv8
+-> ssh-ed25519 eXMAtA mnPmdNNDJVxqRuotVDiDjmbNBDJWOjIzEutjJQmkpEI
+Qfel3hqCMeTwaIPjWGtwMxzPAcW/+uUh6HwbB4Waaf4
+-> ssh-ed25519 5hXocQ Iy5Mdtbt8Q3hJw9MSRkED1LLru/1OWGQV1z8URRW9g4
+QFYMG/n63RANBdX3m048xD+jnKTOzEqO47mzLXsKvt4
+-> ssh-ed25519 bRHVVA ZzQbVvTQJIOXtR3vEpKtsgSrIVXd53ejCjDGw68e3AA
+B+bU6mr3j0a2Z6s2zW+H6rB5EzSV9ZFx79AagQ9CPIo
+-> ssh-ed25519 HgW9eA 4OTLSLBPA6JcHnomgXbv0NPnpvThtI7dU8bJowyaZx8
+RJGvJBd3V7pCbIpi1G+lbPsFkfyV7lJSoHkKODuKNjs
+--- ri1zkahSrfRoGUecSHXCZ6RmLWd0Y9oAzyBfiDfbqVk
+ú@ñ@ÐZ“×þs- cñx`ÔwM1°ÌÍ~H;
ÒÊœswâ¬–•(<28>Ãñ6ŽxñŒeßX²z<Wˆ$ôndm#˜	×]e¢<1C>ù‚`1çÞ§tŸ@Âç…=EYâ3{ž§5
+Ÿ’^<àVŸ¥m'Òù«WE(T|lËøtª©ñ!èVî±ŸíWÝ8ÞÿÂë¾
--- a/secrets/reverseproxy/.gitkeep
+++ b/secrets/reverseproxy/.gitkeep
@ -0,0 +1 @@
+
--- a/secrets/vaultwarden/env.age
+++ b/secrets/vaultwarden/env.age