use a nixpkgs version unbreaking both TF and peertube

see 318 about the regression breaking the peertube test

infra/.terraform.lock.hcl

@@ -1,16 +0,0 @@
-# This file is maintained automatically by "tofu init".
-# Manual edits may be lost in future updates.
-
-provider "registry.opentofu.org/hashicorp/external" {
-  version = "2.3.4"
-  hashes = [
-    "h1:HfVaWMC7Tz+tRfoWZtGCX2MATcgX3HsexoirWdi/voo=",
-  ]
-}
-
-provider "registry.opentofu.org/hashicorp/null" {
-  version = "3.2.3"
-  hashes = [
-    "h1:qTlGDGC3RmXIPLgwsIh4LHG/DrAR6T6L+Wn6egnQnwE=",
-  ]
-}

infra/dev/.terraform.lock.hcl

@@ -1,9 +0,0 @@
-# This file is maintained automatically by "tofu init".
-# Manual edits may be lost in future updates.
-
-provider "registry.opentofu.org/hashicorp/external" {
-  version = "2.3.4"
-  hashes = [
-    "h1:hBFp4dEKKevoZEsMW32ralBqrO7cTxTPYdWPqc4Ff+s=",
-  ]
-}

infra/dev/.terraform/modules/modules.json

@@ -1 +0,0 @@
-{"Modules":[{"Key":"","Source":"","Dir":"."},{"Key":"nixos","Source":"../sync-nix","Dir":"../sync-nix"}]}

infra/dev/.terraform/plugin_path

@@ -1,3 +0,0 @@
-[
-  "/nix/store/zbjjm6vgdj1p2v21qshd9np3ajdnhniy-opentofu-1.9.0/libexec/terraform-providers"
-]

infra/dev/.terraform/providers/registry.opentofu.org/hashicorp/external/2.3.4/linux_amd64

@@ -1 +0,0 @@
-/nix/store/zbjjm6vgdj1p2v21qshd9np3ajdnhniy-opentofu-1.9.0/libexec/terraform-providers/registry.opentofu.org/hashicorp/external/2.3.4/linux_amd64

infra/operator/.terraform.lock.hcl

@@ -1,9 +0,0 @@
-# This file is maintained automatically by "tofu init".
-# Manual edits may be lost in future updates.
-
-provider "registry.opentofu.org/hashicorp/external" {
-  version = "2.3.4"
-  hashes = [
-    "h1:hBFp4dEKKevoZEsMW32ralBqrO7cTxTPYdWPqc4Ff+s=",
-  ]
-}

infra/operator/.terraform/modules/modules.json

@@ -1 +0,0 @@
-{"Modules":[{"Key":"","Source":"","Dir":"."},{"Key":"nixos","Source":"../sync-nix","Dir":"../sync-nix"}]}

infra/operator/.terraform/plugin_path

@@ -1,3 +0,0 @@
-[
-  "/nix/store/zbjjm6vgdj1p2v21qshd9np3ajdnhniy-opentofu-1.9.0/libexec/terraform-providers"
-]

infra/operator/.terraform/providers/registry.opentofu.org/hashicorp/external/2.3.4/linux_amd64

@@ -1 +0,0 @@
-/nix/store/zbjjm6vgdj1p2v21qshd9np3ajdnhniy-opentofu-1.9.0/libexec/terraform-providers/registry.opentofu.org/hashicorp/external/2.3.4/linux_amd64

infra/pass-ssh-key.sh

@@ -1,15 +0,0 @@
-#!/usr/bin/env bash
-export host="$host"
-
-mkdir -p etc/ssh
-
-SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
-
-for keyname in ssh_host_ed25519_key ssh_host_ed25519_key.pub; do
-  if [[ $keyname == *.pub ]]; then
-    umask 0133
-  else
-    umask 0177
-  fi
-  cp "$SCRIPT_DIR/../infra/test-machines/${host}/${keyname}" ./etc/ssh/${keyname}
-done

infra/sync-nix/.npins.json

@@ -1 +0,0 @@
-{"agenix":"/nix/store/glsqq1xn5al7d528hvlbm4hl3ladxmka-source","disko":"/nix/store/7wf9q0mb1i43x9dr1qlyfaraq15n6sii-source","flake-inputs":"/nix/store/fqln0bcp6mp75k4sl0cav2f0np60lwhj-source","git-hooks":"/nix/store/8bh3jgq1riy3jxm07vy4xxzvk9xd74pc-source","gitignore":"/nix/store/g5v3sgqy6a0fsmas7mnapc196flrplix-source","home-manager":"/nix/store/cq3b3cx5rv9d0zj57kch9wmxzc2rm8dc-source","htmx":"/nix/store/mwqqk0qmldzvv4xj9kq2lbah2flhc44z-source","nix-unit":"/nix/store/4g1vvy7bhwh16cyd2r8ibq7n6ygk1wvk-source","nixpkgs":"/nix/store/g1bajdwbkcmms8cqd9s8zbq8zxhkyx91-source"}

infra/sync-nix/.terraform.lock.hcl

@@ -1,9 +0,0 @@
-# This file is maintained automatically by "tofu init".
-# Manual edits may be lost in future updates.
-
-provider "registry.opentofu.org/hashicorp/external" {
-  version = "2.3.4"
-  hashes = [
-    "h1:hBFp4dEKKevoZEsMW32ralBqrO7cTxTPYdWPqc4Ff+s=",
-  ]
-}

infra/sync-nix/.terraform/plugin_path

@@ -1,3 +0,0 @@
-[
-  "/nix/store/zbjjm6vgdj1p2v21qshd9np3ajdnhniy-opentofu-1.9.0/libexec/terraform-providers"
-]

infra/sync-nix/.terraform/providers/registry.opentofu.org/hashicorp/external/2.3.4/linux_amd64

@@ -1 +0,0 @@
-/nix/store/zbjjm6vgdj1p2v21qshd9np3ajdnhniy-opentofu-1.9.0/libexec/terraform-providers/registry.opentofu.org/hashicorp/external/2.3.4/linux_amd64

keys/contributors/niols

@@ -1 +1 @@
-ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICJj4L5Yt9ABdQeEkJI6VuJEyUSVbCHMxYLdvVcB/pXh niols@wallace/fediversity
+ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEElREJN0AC7lbp+5X204pQ5r030IbgCllsIxyU3iiKY niols@wallace

panel/default.nix

@@ -12,11 +12,10 @@ let
   manage = pkgs.writeScriptBin "manage" ''
     exec ${pkgs.lib.getExe pkgs.python3} ${toString ./src/manage.py} $@
   '';
-  package = pkgs.callPackage ./nix/package.nix { };
 in
 {
   shell = pkgs.mkShellNoCC {
-    inputsFrom = [ package ];
+    inputsFrom = [ (pkgs.callPackage ./nix/package.nix { }) ];
     packages = [
       pkgs.npins
       manage
@@ -34,10 +33,7 @@ in
         REPO_DIR = toString ../.;
       };
     shellHook = ''
-      ${lib.concatStringsSep "\n" (
+      ln -sf ${sources.htmx}/dist/htmx.js src/panel/static/htmx.min.js
-        map (file: "ln -sf ${file.from} ${toString ./src/${file.to}}") package.generated
-      )}
-
       # in production, secrets are passed via CREDENTIALS_DIRECTORY by systemd.
       # use this directory for testing with local secrets
       mkdir -p $CREDENTIALS_DIRECTORY

panel/env.nix

@@ -13,5 +13,4 @@
     pkgs.jaq # tf
     (import ../infra/tf.nix { inherit lib pkgs; })
   ];
-  SSH_PRIVATE_KEY_FILE = "";
 }

panel/nix/package.nix

@@ -26,12 +26,6 @@ let
     packages = [ "${name}" ]
     include-package-data = true
   '';
-  generated = [
-    {
-      from = "${sources.htmx}/dist/htmx.min.js";
-      to = "./panel/static/htmx.min.js";
-    }
-  ];
 in
 python3.pkgs.buildPythonPackage {
   pname = name;
@@ -61,10 +55,6 @@ python3.pkgs.buildPythonPackage {
     ]
     ++ pythonPackages;
 
-  passthru = {
-    inherit generated;
-  };
-
   postInstall = ''
     mkdir -p $out/bin
     cp -v ${src}/manage.py $out/bin/manage.py
@@ -76,8 +66,6 @@ python3.pkgs.buildPythonPackage {
         }
       }" \
       --prefix PYTHONPATH : "$PYTHONPATH"
-    ${lib.concatStringsSep "\n" (
+    cp ${sources.htmx}/dist/htmx.min.js* $out/${python3.sitePackages}/panel/static/
-      map (file: "cp ${file.from} $out/${python3.sitePackages}/${file.to}") generated
-    )}
   '';
 }

panel/src/panel/settings.py

@@ -10,19 +10,14 @@ For the full list of settings and their values, see
 https://docs.djangoproject.com/en/4.2/ref/settings/
 """
 
-import re
 import sys
-import subprocess
 import os
-import json
 import importlib.util
 import dj_database_url
 
 from os import environ as env
 from pathlib import Path
 
-STORE_PATTERN = re.compile("^/nix/store/[^/]+$")
-
 # Build paths inside the project like this: BASE_DIR / 'subdir'.
 BASE_DIR = Path(__file__).resolve().parent.parent
 
@@ -249,12 +244,3 @@ bin_path=env['BIN_PATH']
 # path of the root flake to deploy from
 # to deploy this should be specified, for dev just use a relative path.
 repo_dir = env["REPO_DIR"]
-
-output = subprocess.run(["ssh-agent"], capture_output=True, text=True, env={"PATH": bin_path}).stdout
-ssh_auth_sock = re.search("(?<==)([^;]*)", output)[1]
-ENV_VARS = {
-    "ssh_private_key_file": env["SSH_PRIVATE_KEY_FILE"],
-    "deploy_environment": {
-        "SSH_AUTH_SOCK": ssh_auth_sock,
-    },
-}

panel/src/panel/static/htmx.min.js

@@ -0,0 +1 @@
+/nix/store/mwqqk0qmldzvv4xj9kq2lbah2flhc44z-source/dist/htmx.js

panel/src/panel/views.py

@@ -1,6 +1,5 @@
 from enum import Enum
 import json
-from os.path import expanduser
 import subprocess
 import logging
 import os
@@ -106,7 +105,7 @@ class DeploymentStatus(ConfigurationForm):
         # Check for deploy button
         if "deploy" in self.request.POST.keys():
             deployment_result, deployment_params = self.deployment(obj)
-            deployment_succeeded = deployment_result == 0
+            deployment_succeeded = deployment_result.returncode == 0
 
         return render(self.request, "partials/deployment_result.html", {
             "deployment_succeeded": deployment_succeeded,

secrets/forgejo-database-password.age

@@ -1,17 +1,17 @@
 age-encryption.org/v1
--> ssh-ed25519 Jpc21A 9edPaA2tT4SeYNTPzF0E157daC2o+JH/WQQCT+vLbFg
+-> ssh-ed25519 Jpc21A JzLWMEH98I5/A8O55mKUMy5zo2kg3Qk8SfXnHvkjwT4
-C48EtLdhB75TTzfEZTw1DypicHiVlSmFzjfbqfO9N/8
+8f7zDHSp3AHoAQy0dVWMa1TurCBLnsHNtbNjaD++7ow
--> ssh-ed25519 BAs8QA T+kXpZg1v0XRkub5DWir7vYwO7KaOJLZBNYxxXiBUCw
+-> ssh-ed25519 BAs8QA eCD3saYXdv1bjAoQghmyVqHjMBu/o2lWgu7grk1vgRs
-zBRwMTDpyI7twEwUGsmJYyYPw9btBx5Kakj1yT+XY8U
+//pOnkzqQTK3xmeCjruo46ju2X136KEt6DpsegMouFQ
--> ssh-ed25519 ofQnlg 4UoEDY/tdKz8LrX1BkBU1/cn+vSaYLUl7xX9YmzANBY
+-> ssh-ed25519 ofQnlg ePjq7GmM36qaGxcJ0qnW8FdKDjwlXtFqOBK8OgWY3Co
-8CACq1n3AJgD9IyPN23iRvThqsfQFF5+jmkKnhun24U
+gVmsDP9rMcQD/B6BpNhCn+avdgjhyyohNUXlatXpXo0
--> ssh-ed25519 COspvA HxcbkqHL+LpVmwb+Fo5JuUU+C+Pxzdxtb0yZHixwuzM
+-> ssh-ed25519 COspvA lrQB/NEmMUR2RWxfRzE2iTDkjMYsrIaiKn8thxZR+RA
-7FIhxdbjHJlgQQgjrHHUK5cecqs5aT7X3I8TWf8c2gc
+MU23Z28v+cNk2VxpAYaYoFb53js2Zr9/KAM9uMe6+EA
--> ssh-ed25519 2XrTgw R6Ia8MVIZKPnNZ0rspZ34EqoY8fOLeB9H7vnvNBLg1g
+-> ssh-ed25519 2XrTgw z1ixx5dYCNbgw6wWV45b4wn69X/5/4MzesTomWa4WB4
-55NUqz5Yygt6FKJ3bR5iHxQp8G7S2gyFwrJNX1Pb/2Y
+eNSlP6+nUW9rpsGyzqOEQ+7IVpGeU3UcZpyfB9XT2/4
--> ssh-ed25519 awJeHA hJdTuAScoewVMt7HWiisSkL0zSeClFzYzzKL84G893o
+-> ssh-ed25519 1MUEqQ c6ps9RB6Dw9JtR0+4eB1NDx44uUes8YjLrY7RCpD0jg
-ou780VLrW1s4d6L+lEVu3kXaGn4dvtFPA31supwEL50
+GwVRqR5t07ctbWhwH76T+SAe2Y6Vv1uY/AHkzd/gw/c
--> ssh-ed25519 Fa25Dw mJcqnXA3fQeoKrG7RJ7nVeLxPvrxqbj+lJdx6jQ9IR8
+-> ssh-ed25519 Fa25Dw jTqtV2RWsXBH4zgWAYr9tBGC/BbXKBvr3uyL8IgmI1o
-f5Q7mrQSSDsm1Z/uSAnvx66mgnRC3XaBLQrVL9f/Ijs
+qBirnzIpi9hB61xwyS+5U6XBobAquEJrV3cleDtG8/4
---- W/KmboXTLV12X6WtVQKHNe+ZHvS2q9EHUZwofSgJSE8
+--- j/vJgDV+47UmKokdvztXntBIhCLEyUm2aYoGJ2WMKbU
-^kûÚ	h©0ÔkÇ ¢¸_Ç·ûQÞm‘’7\òÖ}÷Áë?½qø‚<ÿm
+¢¹ŽÀi‹±ËQõf §¥ÐÅ·DN§àB"—ÍvsëB6PùQžorF‡<46>Å

secrets/forgejo-email-password.age

@@ -1,18 +1,17 @@
 age-encryption.org/v1
--> ssh-ed25519 Jpc21A ZyJtpgzBrA3WFa1+uiNLZieP6GAqYzAtjmUkgbqKwyA
+-> ssh-ed25519 Jpc21A l6Xwv4JBlTeRTC7RgjxY9gDrCk96atMUH/62P+u55Qs
-TeO/ghRNVJQrdeFAvgQITC6MC7x7IHDtFYqHVloVfAQ
+CrYsLZgDFAiR8up87lhGZqsbAEZtOXG+l5IzLh2uaqg
--> ssh-ed25519 BAs8QA zIfPuCmSZyosDfWvL6A5DstWeBORDkjqb6Hxjx2dYgE
+-> ssh-ed25519 BAs8QA lgtmfoc4vKfRpI/XbIS258BMyIB4mTdquEx/Kxm5OTI
-Nq/YU6oDlIC+ROtM2P5aBeF6iJsxUbrU2LnLDRux35Y
+3gQL8Rnqc7JfqsRmKYU3rD0cWMKdnIeVXbY3eFM07RU
--> ssh-ed25519 ofQnlg dm1bj8BJxD1MpFqdDkfDL4wWV7mjmb51hVqkk2uRfwE
+-> ssh-ed25519 ofQnlg 0vwuCrduMLjssA3CK3gfVPMSPYKO9cF7HH1JF/oJv18
-N7Bwhw1agAbNGaF57VmFKwIWeUibaYRSu2Ke1ZlXPLQ
+2KrZgQmpvw/tNDJrDArinnbEjopkkmuG8s7t6klBXcQ
--> ssh-ed25519 COspvA /DYoVVG4SOFgrIbMvEP0U7QpX6VK9otJVBYrj4I0dlo
+-> ssh-ed25519 COspvA NT+/h2KsiZN2XbaWAlrTlDwyAPmHWrwgr6f0uhSbEGs
-5EWys6IcMgrwW2p5fFeJEgDqandyiS1RzMvqGsN1X0I
+QpoAd+69VYrZwAC0LwDm1m/zfslVgzxpVFihQWDcqzE
--> ssh-ed25519 2XrTgw YW5gzijsL1oRa5vQ3PY+8o3iNZIji1BZfB9dGcg9QHA
+-> ssh-ed25519 2XrTgw QoJ/74FOqYFxHJYXJEkyzbGY0xptSjorNvnyUS1p6zk
-0WWu3F1Rpo9mi4YU2r3Jydr6Fg7bqWMuTtMJOEOj3NU
+0sJ2F6IFuTrRvXO5ND1QL4CZ2lr1BAU3iQffC6Uc3h4
--> ssh-ed25519 awJeHA 8xl0RpXAJ7X5pe6qzDKXHJvMnjYEN85BS+maFytsSDQ
+-> ssh-ed25519 1MUEqQ xxgEUIhvWN/ZfRMGfu3fKQ+fWM5WSz8OexXPm6jaXDk
-MQYrdbh7w7TwGk2Wivja8acQYkmYZ2YWMkE/YA/5K3g
+RXe0JMZ0sYMdQvrbi+zAs9F3d98ocRFnsSGUuUWccRk
--> ssh-ed25519 Fa25Dw koR3KjKzS3Uei58I68qYkgxE0ifhIXKTblpD4cFAVhQ
+-> ssh-ed25519 Fa25Dw tw4sqQcO86Gh0FGUD+O3bJ+8OcaN5rm8R6qocXvDbRg
-X7mQgsMY02VHyxJUVN5ml/QRVTjBDm7BD4w0g3Jwmq4
+7hiWa4qznHTV45kvC7ucj7j7FbPrqYK5OcCcByrcSxg
---- E6iHgNV3cjQrhNcZa6uqUwvGxf0ouNZpPXhet3Vicrw
+--- kvZDYq5n/OXu7xe2Kf5vGN0zosl9fgH4CAf3K0Tq3U4
-…ïò”F


Q/Gíù°ʤT]‘ns&[›ýëú&œæ
+¤D!´Ój]2ï‹ÝƒT+•
ÃUó¬æcgÝoP”‰ ˆF.Þ¿
_vbÕÓÔdª9
-Q(6pòM$È™ü Çõ

secrets/forgejo-runner-token.age

@@ -1,15 +1,16 @@
 age-encryption.org/v1
--> ssh-ed25519 Jpc21A N/T7HaInZ13IlJfzeli5nRz5pdBQETO6D1P8X42IHRw
+-> ssh-ed25519 Jpc21A 7QzPABl0IuQlZ9nsqfdbmWT9zb6iHGEOQiJ5sBpuLWU
-q431ZtsodQ9NgcWTjmS0Kx4ATwVFp2nkm+MHe7aXTZU
+zusphKpt0yVxQj0zh4AGtYFORIhUoJHJBYfEAHb/VN0
--> ssh-ed25519 BAs8QA +VUHgmz2oNG6L1FgZy3uGVMs6qUGirFHK8Ts2ghNLHs
+-> ssh-ed25519 BAs8QA PBfmSc0pag5zCqB/EKvirDXyleNi2sgMZ0xTAMiANFo
-sjQu78xqM6KLmRiYd2o2uK/PjYLnyZihzVoCV7qKBX4
+gugtjl9TSsGQuPypQiKZZqr7JfMKSdwVHGGKevyfF+k
--> ssh-ed25519 ofQnlg cBfd95Ir33ggt1J1P2TkFRULr2uYPVuyrQ5XpjBxEW0
+-> ssh-ed25519 ofQnlg RQd9jPyn8nv1zCLbETa9/JB39fwX3X0X9gElcHWEfCA
-TWFVHboXr95cFm5yjQ7gn7hjbSmVBfB/9dldsoga/9Q
+7ZEBE4qaZUtrXLc0caZ/tfJFYT9UDYkVvuaBc0SVBhc
--> ssh-ed25519 COspvA RMW9FlDmiQUu7cg0fKir55VqrDRCoYVVZMOcMHyrMj8
+-> ssh-ed25519 COspvA plM6PJykVR0NuSrOkRkA6ucOzUpijFaKbe99jaVrQSw
-qeXkWdKFJN7APgYh7AjyJLeQI2CAEaGAcXiVaBaOJwY
+7AkcdijjOSckx3GxXwXo1K34ReU3x0yWamlxdaA1FWA
--> ssh-ed25519 2XrTgw BRobowRWZ9giVL2dFyGvzzF7gyWUQd1ounMQBtsM/lM
+-> ssh-ed25519 2XrTgw +2ZOwvZRUmnuHVV8poyMR6eIvPQoxWQRngKJdL2kVHc
-dFyli2skTgzVWGVolLG2GuGNh/Xu3IaJsznOkcWqKGc
+rzWJIuZUtuurvIdV/47N2CNu8x4T/vca8IeRqi+mk/I
--> ssh-ed25519 awJeHA Cu7fiv+SL71oho/xoJMw/Lztf4WkNKmImVS/8xyLiTo
+-> ssh-ed25519 1MUEqQ 9U13b5LO4pSKhlvWEtkdrjTmVO5oGqcdT3Ime1AHjH4
-3sB/t0squi1crjHFBaN6btrvGUeWaKfmGa7yxREvy2o
+8wC87WZZYMZaR2YlG3oEt79QcZMA86TrUbvTekAUkqw
---- SqPDTJ/XV26nNG1ib5phNNRdQi5+Wk0cxhqUr1ygjGw
+--- X8Szdu5EyyPKR6xaL/8uKdHRc/D7wVGizk5k0XanreQ
-Æt”OÊá<C3A1>âåYöª¶^´Iõ×U<C397>j†ë!
k‹Y.<2E>^<5E>}Xúôæ¡3¿ÖŽ"kE×íšú¾‹s¥,0l+¾ýn‡;fW®‹
+¯<EFBFBD>欿Æj{Ò“¦!q-ò˜G:£ÂjQò[_Ä„=ò<>#ÇŸd¾(i@/f3º’n°¦ý
+r :Ú‰ ¾×tx–ð¬|<<øX¡ÜºÊ¼™¨

secrets/panel-secret-key.age

@@ -1,17 +1,17 @@
 age-encryption.org/v1
--> ssh-ed25519 Jpc21A 98RNGhrNW+Pg5EeQ6wOgRNaPqauBrI0hnUGDyCpFsQ4
+-> ssh-ed25519 Jpc21A fBhVzGFs61K63QtA8RdOuuGfHFjMe/Dp0M6TXGLGWDU
-5ZCq4vkp6N9/KR4Uf0e9MtNM1SHD3Pr97B31or6y8Xc
+qppnUZ+LQCXhuMCFMYv2D2CkmEfjb7mpmJufIeVjjaM
--> ssh-ed25519 BAs8QA znlRV7zbTUMsnDY/TiNgeCaqzi87jL/r/5dhc7bJ7hw
+-> ssh-ed25519 BAs8QA PNicZCWLkbvM4ih77/F4z6FzHomL9EsJCuSCjbdRTwA
-9pwl5mcmbHaO39jmiuOkaC9mpyiS3xQSCd7q17gH6OU
+qIpTl/v7Xl08qBB//dFeW9qQiZg10YrYLnfyQrgDRfQ
--> ssh-ed25519 ofQnlg Wr8M7IpBjvNatOlfmRodoHicPjSjyMVqkC+R+18SYjk
+-> ssh-ed25519 ofQnlg 9/vSN3V25ysXBOvS4UJQEzm0734zqO0gXjhgzX63tTs
-Th18PUYoo1TvP+d+6aXLvipsm3QPW+DKQSv8rJqeblk
+AH9Q1lWr+RgICfW3h+D2SgCTFr+azI0x3J3eFnaz/XA
--> ssh-ed25519 COspvA spxBYfEWDeKhaSsufZ4GDtIMKz8XznD4kS7Zjb4BLFU
+-> ssh-ed25519 COspvA IB1nWOMaVZVcvEog6UaqCak2fcKxIUN2yXvvRSTDxGw
-B2wT7+bXgWezmUIj0mpVPPjKOoIj7cDH16uvW4ujbss
+Ti7JuBgU6phlI+oXfDDvx42dRu95kTwesRUKu4QsXZ4
--> ssh-ed25519 2XrTgw lY+t4jvdSgZ5ZKMemAN0u32fPUAraaGu+ExMEsR/c0w
+-> ssh-ed25519 2XrTgw 7S9ZhJvUFMw9tDCc0HvkRsRqjvmn47GFGVg/jkxIy1I
-KfOBcGrhIztEnKKmsv6ZD6K9TleZRgIRWbOlG8Tcvaw
+cj27gqqihSZG3Jcab9h9FyNJ1J8FjlUiyVlDot+sbWQ
--> ssh-ed25519 awJeHA 1VVLZa0l8LX79LqZqlYRfXmKVIi9zpLcoysi0NQ3L0o
+-> ssh-ed25519 1MUEqQ l9mVTLD9rZXisBEz0sU2AdFNrJQ/+zuFTiIod5R/HCI
-m79gHUkQ87zFoB8Awlcxt2GrCMrwr5KSfyiSqa6kEko
+2q3csSEvMW5vtzqGHYTtZ1nZ0J1vT23bjhuj9HTsdWk
--> ssh-ed25519 kXy85Q uaEXsQeApgXqzWZRL0AtsPqjt5qOWxoQjN1Keiii1Ds
+-> ssh-ed25519 kXy85Q BCrDvkPZLvx2Kvgapa3BT+AmpS6Fa5kpkgBnRVso2BE
-LtHUNkV3n/jgeAcEIyq03z84KKa5qQoAo1aaJeK6Duk
+ZBi+x/2ilJIzhzGipdZQJoGOjSqCuAttsqCDVFlYJ8Y
---- 6s4nA95ds+3slR3QtHQmAkTEBNlSOQusQzjaY/3M5Ds
+--- iWtseKyfUMBkQTUl9QzwXXLQcodEJeZt1Wuj5sR18yY
-tÑ:ƒX‚´¯=χ´ù8€OoùxþÔ;ì“ÀyIý²ˆµÌˆõêJ/oW0Ô¼; x–$£tŠœ‡,7£-aý
++2,ｴ	ﾟ恝Jrﾒｨ>ｱ<7F>z?ﾎi<EFBE8E><69>ｪ<EFBFBD>x<EFBFBD>0z<30>ﾔ智ﾒ劬呱^ｩﾈｺ食･濤礫+1｣ｧ<EFBDA3>

secrets/wiki-basicauth-htpasswd.age

@@ -1,18 +1,18 @@
 age-encryption.org/v1
--> ssh-ed25519 Jpc21A EuMYAiZX+4A12eu19mIY7u+WYF7NJ9qJosQSVlxR6n8
+-> ssh-ed25519 Jpc21A BfHJN3vILbsfY91kEjSQ+STrn6vQfn83Fx3cBCNshRQ
-bK5CMXAmP23t1p9bgmqoVg4Qcu2qYKGc4t36v8e9eow
+0O8GJYfF8WFS4Xsgj5v1cly4JP1MgSN40OgRdW/i0rA
--> ssh-ed25519 BAs8QA IwRyitDNTzUPzQAUbDNEKjFiF8WPD/OyztOZQeoTEzw
+-> ssh-ed25519 BAs8QA Ue0NLMpmZDSTGvwZ8lhzes7pcmit9F6uwzeT4XhiwC0
-OwiTWvk4NmUgExav0uH6HlThDNU5hsKXfR6KHsFOV3I
+jsvvuOW344i8GR4B139SX0LwTqzKQEgBvsy8oRppqBU
--> ssh-ed25519 ofQnlg 3TcMbLX1JsQL8+Gqy7IFZwykZr2BspvPCuZT1SHtnQQ
+-> ssh-ed25519 ofQnlg 9iSMQeTJn1OUqTF+M2sHpp69lblb8E6TVbgZs7vgD2U
-Ci5OeBj2aiC8ut9jIEUMt3qfYH+cJrnVud6AH54Ndn8
+uMQI1gTTMvYW7ea9xBAln118JEeNvv3nqbq32zJoat8
--> ssh-ed25519 COspvA 0t9f3Wu3ILv4QTJhwT619y+7XFrryCLbpIZC6aE+qQI
+-> ssh-ed25519 COspvA YxCyfe0li23JoI2q4XFVUx4vrWApLwSnJD31PHXuPBg
-oPQP48F6oO/tkqLZDdjkGtIap7KHiAknbpTNL6/yLaU
+8xuT9+W2mnTag9tm6F6LXzHkIh2Nou/8lgxd64OpvWk
--> ssh-ed25519 2XrTgw YOZsaYQH9vMH0QqSXGh8GyhRV4MbcBGPFfFaKpo3Ckk
+-> ssh-ed25519 2XrTgw jEzw0A9Wd1b1Zoryzp/W/QZ6bd99E7sySnr/W2xcnDs
-kUShJbADA+6bpx2adxvzlI/0jSM5bIBfZfdSE/7Vm5Y
+IyMrojJ3AChS6lhj599caNM+02i16qtpc6cocln14b4
--> ssh-ed25519 awJeHA dF3m0hQWX9c0EezDr56Kt/F4d1Uim7NwvIX6zRws0Eo
+-> ssh-ed25519 1MUEqQ haiI/5EkuTZ2YHxsqSVlqfM0VVR24DIDrMS3RmXwAhU
-pst243yrARODwrnyz8cJAzgDxdPOUsRbs7yPZePABFs
+qVIAvLp2qG4A3f3OKUqAKqH1eOicJz54nfblPSUKrSw
--> ssh-ed25519 dgBsjw PUYHcP/tgNnKyvlIoJRcNcW3zabVV1iHXIWfKqgW9xc
+-> ssh-ed25519 dgBsjw /vCnznu73U99onCWcM0aQlW0azscyUe4BB2kKeZvtHs
-tXNjSuVH/g/oN5o75FPkFFpviF7SeFSN9kbqURvgMDE
+MPnvXR/WVsl/tJ1YPoc7nk2Ls2x9bbtJdNp3CQTuuWI
---- wHgBAN9c6F6T5hFJGo8uH8zqDkQDwx3/jVNKUtQ3arE
+--- OzkqKlw4xu3McMk20orQN0h+VPYfUUSDC+DsgRU1tSw
-«Ñ¢Á
+ü^@ÃmŽÚé`B˜³#{¡Ÿ‚ GUu´‹|¹Á œ¡ rÚïjb¥:Ô“d²ù]	GØΩ¦ú²-«Â–MÁ³ŸÜálÙ3mÌí)½š@¢—±e?¯ªêe¤üZ
-ò@µú¡fÃ`m;ÕcæäU²€ùò£Íd…eS’èyfv¿»¡€J?ø `œfj£Äa}lÃó ¿Úxç²BÇt2èfìôm08ÓoÝtRál9˜èx¤¢ŒÅž›æ÷
+Y}ÿ!fÐ

secrets/wiki-password.age

@@ -1,17 +1,17 @@
 age-encryption.org/v1
--> ssh-ed25519 Jpc21A TUGMeCK5ZehSdtfH2xpEEvMp4jZxJ2fTogXSkcf6blg
+-> ssh-ed25519 Jpc21A RFzPu3fD28STex7ND5lE9bfCxQq/xeHEb7h7BFt9pVA
-BY6cKeB3MV84KvYThJsU0TSW5kMUJpbVVvccVtwtEIg
+8K+ECDGs71V91jEVQjrRVQNbdTzBb6W9jkp0+K1trzw
--> ssh-ed25519 BAs8QA 9LgEP0N4MF4uEXLXGWRLgJzC9llYpKiP2lwAgN0ObxA
+-> ssh-ed25519 BAs8QA F2L9Eh9OItaPfAcR4qNnOQnvCyTeGdR5lSu0WqXiuU0
-cOI90Sc2ORgvFZD2I+oYcRa1Y47X2tuvFFqqKFo78nk
+3jLlt4qAL3/VKyfbP7R0/7SUwwPpWf5YUWwzjDONEy8
--> ssh-ed25519 ofQnlg LYTsntB2zI1EJ8yyYOH6BvHXEOv+zX7QYrd7leXPeDA
+-> ssh-ed25519 ofQnlg BLdBNuJExNlYED/XFU5zmYPtO1bxumuyPPgcs8qSLEY
-uqhuPl2udjxDMIdMd88xpQuAZ/QMXSLgxOeOhHyTjW8
+wIi31st4WS9O2a7VJmYpE8PimgzLvwU6zWkvHCy84yQ
--> ssh-ed25519 COspvA geel/7vCPHmBT6Sg0bTqeUV4rA/i6w0NvFjGk8rF/VA
+-> ssh-ed25519 COspvA GmC8YZVv3ZwidaDKUkLhx0l8UOmRw5ZBiM8r4/Ub7xA
-8eIF+oWuM+16j1n//ndImjTPxPYqZ56WA8K5uybMbTo
+wK994Zs1aLspqY84Ik77qdMaEsjs0ZFNuKQDOGXsnmM
--> ssh-ed25519 2XrTgw uCKoYMidpNwfo2YDb2jyjONZvExK2wrZXXvv+ywrCCA
+-> ssh-ed25519 2XrTgw s62q7KOHZRqimCTwazX9LUvnpcYuzxwflumXe6NVF38
-X0E+2LuftCF3oAHp8z18WRZePAYt6tEYjnNAgMmfUNo
+WnOpHI9ejvRrZrQuasTEYyqP8ny3Hx9Q9bJzbK0pOI4
--> ssh-ed25519 awJeHA 4cTdqU2X1gXyFxMHGHPgUq9g8XUM8sgbNa/NMl2GZmI
+-> ssh-ed25519 1MUEqQ 9NLHR5OwOngiLRguTkf5KnUHrc80mambCw19dPPKPQ8
-J7cWCuKrf+r/nE0FjGj/DQDv7hBqbn0NidjY2m1mwGw
+GDg9yRoRUaP1KOa/pOCFiLCCAxuFsuCIiDP/ERl8YLA
--> ssh-ed25519 dgBsjw gyI/oiqvAzqxtism9yCygXYLZzCynTdAlPBcwZhryCw
+-> ssh-ed25519 dgBsjw NulCMPtc2miJlHYpXMjQHUlc/HIaX4AqzxXZxt8cWkE
-pKCMRUv6dsH/cS2Tm/gU0mxH6TsF6UGj0Fx4BNvYv9o
+tCh3WD91A89258F8THeddXvab77tTIjNjGxYNDVoaBQ
---- MBLz1UcLi1SCQ2+tA1Zmv+2ZEiw0Ag2C4/gk7lzqJ0Q
+--- oIUm35maOqmHL0nifKpyEvLpHSKmthxIT5DDueCVZDc
-Ú<EFBFBD>©ËƒŽ£Ð Ó1–ÁÞ™òȲ=HK€Ÿ?G	§g
=R!Ì”2›t+Ü€!“ɈUGÞ¶±ïôM°?ö<02>OÉÀÅÊ
+ÈaT~œú£Úôf4÷„Ô$\—ì;¿@Äý`¦<18>(<28>3{VWgM}#<1A>ï9aû6¢½ª^öúT6éÞ!Þ %¿

secrets/wiki-smtp-password.age

@@ -1,17 +1,18 @@
 age-encryption.org/v1
--> ssh-ed25519 Jpc21A EvnCvH6ER6Pied87i9okxBLCx38fNP1fX3wMziJ5PXI
+-> ssh-ed25519 Jpc21A yazxa1xfjFav7HWIvegBhcLIaYnQw4noH+2d9VqyCk8
-b7vN/9pxRWuUrug/bkZIZD+2wSplAGLK+ayO+YYDlCs
+LWgk9DdjH5ktQN0A9RVQN8PB2LlXsEVihwJpU4AFHDY
--> ssh-ed25519 BAs8QA I7dMk+pvKe/bNkIr98muyaOKqTdBitIdrRr5bVN3+DA
+-> ssh-ed25519 BAs8QA XnRG+IYDe3WOBNeNXF4KGCHGVtZg3T2kXJtwmVABjVw
-5D5IGeF6rqF+HNSdDZE/gj0DPHISR3Tzj3Fystm++04
+dfJcTZmDfL/2KuE0XRgO2UYlssaY0T2beTqUTKinhos
--> ssh-ed25519 ofQnlg 3XMrmWBHw6+xfYIn8fZ44ryp1dHS7qVTK0cTJZGjXV0
+-> ssh-ed25519 ofQnlg bVBe7VBynJr7wdVWajiKlVkAogJCsFE+NkVQcOFV3w0
-PxuU0/w27wW/335mteby+kNTr83K6SrjvNEsxBFHOEI
+AUnc6BwNS2YPz1qFBkDGaXlEp+VzlceGllLctHhq1HM
--> ssh-ed25519 COspvA 5yfMt71p+fx9aIT8ubgsHZa9XEJE6trsOOqgC0VxxBY
+-> ssh-ed25519 COspvA dEY4MqMIfidzNBe9tUMZTpJNwYNlq+ngp+RLNEWN4Vg
-dEIuIERcnw6dFb7IMmdzM5b4ySmdg7qtR50X5gQTd+8
+P+Yf/6NAoIFCfKOd4ykDiY62G/3TTk4jtYJkrYY/SBk
--> ssh-ed25519 2XrTgw ZpXWuF2jRWpxlK9HuYZoZyN144cvaNZubVuLBUEq5kc
+-> ssh-ed25519 2XrTgw +FkRMJR2M2KrnR9n8RMrt1m60h4piX4q6c2PuNaIyko
-692sos5focQy0TnUfvz+cLktK2a6tyNS8AWbuDgb4/c
+AdpWCLZ/zLdmYyeWAX3/lQJ6h2bMGwF84KJVLoxm4aA
--> ssh-ed25519 awJeHA ZXx69b4ZvWbwtwnSFjK031mIpK8lDN1nwxq0N+FgREY
+-> ssh-ed25519 1MUEqQ mLU9wlidwicRLBbhSa9Adwn1t3PlMwnCVGZveFSWBEM
-f7GrJm2N908qtPEYY8T22JGhfWHXbUTAdRuEFHGLOKo
+1tiHDboRihGgz+xaylQAdbXQqyCVT0l3xYIbF6to0pE
--> ssh-ed25519 dgBsjw mD/FfN+J2djG/3hR98oPHznAhTyVz5Z8jnJNlQXzWSo
+-> ssh-ed25519 dgBsjw 9t+XYjncpp7OPAo915xXHNfgnPsIuqL/RV1JyF/f/hk
-KULWl9PeO3qwbUNQJix/Zr07l9lsBhPZTR6aeOiyx0M
+GhuVPIyAcVy18vHG5LSREzCe/zLkZDXNNNuIwOsZ9Go
---- EUYAk4OeiL39nwZ7YIlLucUMfBghaegrtgqH+sOUEfI
+--- 66KHbxaXGMDinv6CbC2dL5vHNzR9EJdAYdzoUzN5nKI
--È<>6Q‡äŸ‡7á·™B+Òpûµe³úµ({<ˆ8í‡My|³¿]˜Ãk¾h:žæ
ZŒ§ãde#Äüúû>3„“€K‘<4B>b¨éÀ¬á®øq^uG
+ìŠpH:rØkMµ¨¡mU:GiæÁL#%/©ÀuÌ<75>ÒílzÙ¶/Èí9¨ù|Ô
þûAѬ»2Aü{­A 1Vc
+Êš
€R¯€ájŒŸ‚SéÐ¥Ò