ctucx.git: nixfiles

monitoring: replace `notify-email` with `nftysh-notify-failure`

diff --git a/configurations/nixos/configure/smarthome/influxdb2.nix b/configurations/nixos/configure/smarthome/influxdb2.nix
@@ -19,7 +19,7 @@
     port = lib.last (builtins.split "]:" config.services.influxdb2.settings.http-bind-address);
   in {
     serviceConfig.ExecStartPost = "${pkgs.bash}/bin/bash -c 'until ${pkgs.netcat}/bin/nc -z ::1 ${port}; do sleep 0.2; done'";
-    onFailure                   = [ "email-notify@%i.service" ];
+    onFailure                   = [ "ntfysh-notify-failure@%i.service" ];
   };
 
   services.influxdb2.enable = true;

diff --git a/configurations/nixos/configure/smarthome/zigbee2mqtt.nix b/configurations/nixos/configure/smarthome/zigbee2mqtt.nix
@@ -12,7 +12,7 @@
   systemd.services.zigbee2mqtt = {
     requires      = [ "mosquitto.service" ];
     after         = [ "mosquitto.service" ];
-    onFailure     = [ "email-notify@%i.service" ];
+    onFailure     = [ "nftysh-notify-failure@%i.service" ];
     serviceConfig = {
       Restart       = lib.mkForce "always";
       RuntimeMaxSec = "1d";

diff --git a/configurations/nixos/default.nix b/configurations/nixos/default.nix
@@ -125,7 +125,7 @@ in {
     '';
 
   in {
-    nginx.onFailure  = [ "email-notify@%i.service" ];
+    nginx.onFailure  = [ "ntfysh-notify-failure@%i.service" ];
     ctucxCAgetCRL = {
       wantedBy  = [ "multi-user.target" ];
       before    = [ "nginx.service" ];

diff --git a/configurations/nixos/services/gotosocial.nix b/configurations/nixos/services/gotosocial.nix
@@ -17,8 +17,9 @@
     runBeforeBackup = ''${pkgs.gotosocial}/bin/gotosocial --config-path /etc/gotosocial.yaml admin export --path ${config.services.gotosocial.stateDir}/backup.json'';
   };
 
-  systemd.services.gotosocial.serviceConfig = {
-    Group = lib.mkForce config.services.nginx.group;
+  systemd.services.gotosocial = {
+    onFailure = [ "ntfysh-notify-failure@%i.service" ];
+    serviceConfig.Group = lib.mkForce config.services.nginx.group;
   };
 
   services.gotosocial = {

diff --git a/configurations/nixos/services/restic-server.nix b/configurations/nixos/services/restic-server.nix
@@ -9,7 +9,7 @@
 
   dns.zones."ctu.cx".subdomains."restic.${config.networking.hostName}".CNAME = [ "${config.networking.fqdn}." ];
 
-  systemd.services.restic-rest-server.onFailure = [ "email-notify@%i.service" ];
+  systemd.services.restic-rest-server.onFailure = [ "ntfysh-notify-failure@%i.service" ];
 
   services = {
     restic.server = {

diff --git a/configurations/nixos/services/syncthing.nix b/configurations/nixos/services/syncthing.nix
@@ -16,7 +16,7 @@ in {
     };
   };
 
-  systemd.services.syncthing.onFailure = [ "email-notify@%i.service" ];
+  systemd.services.syncthing.onFailure = [ "ntfysh-notify-failure@%i.service" ];
 
   services.syncthing = {
     enable           = true;

diff --git a/configurations/nixos/services/syncthingNginx.nix b/configurations/nixos/services/syncthingNginx.nix
@@ -8,8 +8,6 @@
 
   dns.zones."ctu.cx".subdomains."syncthing.${lib.removeSuffix ".ctu.cx" config.networking.fqdn}".CNAME = [ "${config.networking.fqdn}." ];
 
-  systemd.services.syncthing.onFailure = [ "email-notify@%i.service" ];
-
   services.syncthing.settings = {
     gui.insecureSkipHostcheck = true;
   };

diff --git a/configurations/nixos/websites/dav.ctu.cx.nix b/configurations/nixos/websites/dav.ctu.cx.nix
@@ -18,7 +18,7 @@
     paths        = [ "/var/lib/radicale" ];
   };
 
-  systemd.services.radicale.onFailure = [ "email-notify@%i.service" ];
+  systemd.services.radicale.onFailure = [ "ntfysh-notify-failure@%i.service" ];
 
   services = {
     radicale.enable = true;

diff --git a/configurations/nixos/websites/grafana.ctu.cx/default.nix b/configurations/nixos/websites/grafana.ctu.cx/default.nix
@@ -9,7 +9,7 @@
 
   dns.zones."ctu.cx".subdomains.grafana.CNAME = [ "${config.networking.fqdn}." ];
 
-  systemd.services.grafana.onFailure = [ "email-notify@%i.service" ];
+  systemd.services.grafana.onFailure = [ "ntfysh-notify-failure@%i.service" ];
 
   services.grafana = {
     enable   = true;

diff --git a/configurations/nixos/websites/matrix.ctu.cx.nix b/configurations/nixos/websites/matrix.ctu.cx.nix
@@ -14,7 +14,7 @@
     ];
   };
 
-  systemd.services.conduwuit.onFailure = [ "email-notify@%i.service" ];
+  systemd.services.conduwuit.onFailure = [ "ntfysh-notify-failure@%i.service" ];
   systemd.services.conduwuit.serviceConfig.ExecStart = lib.mkForce "${config.services.conduwuit.package}/bin/conduwuit";
 
   services.conduwuit = {

diff --git a/configurations/nixos/websites/prometheus.ctu.cx.nix b/configurations/nixos/websites/prometheus.ctu.cx.nix
@@ -4,7 +4,7 @@
 
   dns.zones."ctu.cx".subdomains.prometheus.CNAME = [ "${config.networking.fqdn}." ];
 
-  systemd.services.prometheus.onFailure = [ "email-notify@%i.service" ];
+  systemd.services.prometheus.onFailure = [ "ntfysh-notify-failure@%i.service" ];
 
   services = {
     prometheus = {

diff --git a/configurations/nixos/websites/vault.ctu.cx.nix b/configurations/nixos/websites/vault.ctu.cx.nix
@@ -19,7 +19,7 @@
     paths        = [ "/var/lib/vaultwarden" "/var/backups/vaultwarden"];
   };
 
-  systemd.services.vaultwarden.onFailure = [ "email-notify@%i.service" ];
+  systemd.services.vaultwarden.onFailure = [ "ntfysh-notify-failure@%i.service" ];
 
   services = {
     vaultwarden = {

diff --git a/flake.nix b/flake.nix
@@ -110,7 +110,7 @@
               inputs.self.agenixKeys.main
               inputs.self.agenixKeys."${builtins.head path}"
             ] else (
-              if (builtins.head path) == "all" then
+              if (builtins.head path) == "allNodes" then
                 inputs.self.agenixKeys
               else
                 [ inputs.self.agenixKeys.main ]

diff --git a/modules/nixos/gotosocial.nix b/modules/nixos/gotosocial.nix
@@ -118,7 +118,6 @@ in {
         wants           = [ "network-online.target" ];
         after           = [ "network-online.target" ];
         wantedBy        = [ "multi-user.target" ];
-        onFailure       = [ "email-notify@%i.service" ];
 
         serviceConfig = {
           User = cfg.user;

diff --git a/modules/nixos/restic-backups.nix b/modules/nixos/restic-backups.nix
@@ -71,7 +71,7 @@ in {
       name: backup: nameValuePair "restic-backup-${name}" {
         restartIfChanged = false;
         requires         = [ "network.target" "local-fs.target" ];
-        onFailure        = [ "email-notify@%i.service" ];
+        onFailure        = [ "ntfysh-notify-failure@%i.service" ];
 
         path = [
           pkgs.restic

diff --git a/nodes/briefkasten/default.nix b/nodes/briefkasten/default.nix
@@ -70,9 +70,9 @@
     systemd.network.networks."5-mainInterface".enable = false;
 
     services = {
-      email-notify.enable = true;
-      usbmuxd.enable      = true;
-      logind.powerKey     = "ignore";
+      ntfysh-notify.enable = true;
+      usbmuxd.enable       = true;
+      logind.powerKey      = "ignore";
     };
 
     powerManagement.cpuFreqGovernor    = "powersave";

diff --git a/nodes/hector/default.nix b/nodes/hector/default.nix
@@ -67,7 +67,7 @@
     age.secrets.resticServerWanderduene.file = secrets.allNodes.resticServer.wanderduene;
 
     services.syncthing.dataDir   = "/home/katja/syncthing";
-    services.email-notify.enable = true;
+    services.ntfysh-notify.enable = true;
 
     system.stateVersion = "24.11";
     home-manager.users.katja.home.stateVersion = "24.11";

diff --git a/nodes/trabbi/default.nix b/nodes/trabbi/default.nix
@@ -32,7 +32,7 @@
     age.secrets.resticServerBriefkasten.file = secrets.allNodes.resticServer.briefkasten;
     age.secrets.resticServerWanderduene.file = secrets.allNodes.resticServer.wanderduene;
 
-    services.email-notify.enable = true;
+    services.ntfysh-notify.enable = true;
 
     system.stateVersion = "23.11";
     home-manager.users.katja.home.stateVersion = "23.11";

diff --git a/nodes/wanderduene/default.nix b/nodes/wanderduene/default.nix
@@ -79,6 +79,7 @@
       };
     };
 
+    services.ntfysh-notify.enable = true;
     services.ndppd = {
       enable = true;
       proxies.ens3.rules."2a03:4000:4d:5e:acab::/112" = {

diff --git a/nodes/wanderduene/rclone-restic-server.nix b/nodes/wanderduene/rclone-restic-server.nix
@@ -27,7 +27,7 @@
     wantedBy  = [ "multi-user.target" ];
     wants     = [ "network-online.target" ];
     after     = [ "network-online.target" ];
-    onFailure = [ "email-notify@%i.service" ];
+    onFailure = [ "ntfysh-notify-failure@%i.service" ];
     serviceConfig = {
       User = "rclone-restic-server";
       Group = "rclone-restic-server";

diff --git a/secrets/allNodes/ntfyshEnv.age b/secrets/allNodes/ntfyshEnv.age
@@ -0,0 +1,23 @@
+-----BEGIN AGE ENCRYPTED FILE-----
+YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IFlpZ1k1USBvQWpN
+WFVVQlZlbjV0cmZtN09EdE41UzhJc0RlcmlyWDYyc0FrNmZVZm4wClNaR1J5eTA1
+czVGamdpSzJYNGY0aGxya0hrSkhNUEJGdk1RblZFZkNrSUkKLT4gc3NoLWVkMjU1
+MTkgNGhLQ013IEF0NXNKYUhKWStGT1pzbHh2WGZVUE9uV3ZZUFRaR1UrMGxTOC9I
+a3VlZ0kKcnRudXFMeUllRUF1QW05T3Q3cnRqaEFtUDhKbTZrY3Q5SVgvZzQvYS94
+SQotPiBzc2gtZWQyNTUxOSB5YUxIU1EgR2xhNFJFRU5DN2lhcnNPVlg3M0x2cldo
+VHFxaVBidno1VkkwTHBLTlZBMApLenl3NlVBV1RzSyt5dUxEOVlQU2ExS0FsVC92
+RlZQYjFCZXJUZ01uMXowCi0+IFgyNTUxOSBhbm5xWThCMDF2WE9qbmIwVkRrS0hr
+QmFhdVhPSi9VV0tqdVMrQmxCbFRjCmJhZ0xUUG9lblI1UDIzNGp4aVBjbVBxQ3Z4
+VCtObWF1K05TaHZXZldJTjQKLT4gc3NoLWVkMjU1MTkgU1lqNklnIFN5V3RYaEpF
+d2R2eXFjaUcxYWdldkpWTDRjTTQ3ME44SWZrSDN1d01BM00KSHZTVmRRdWxrNkVN
+UlNCVXZUZ3lXUjY0ZmRUS1JRSFVuTWs3T3NHLzlGNAotPiBzc2gtZWQyNTUxOSBx
+OG9jemcgWG5NZC94eGRoVkpFZzJpRVNFWitrRGpQRDdPZjNJU1M2NWdwMVJtOXNY
+NAo3bkx0Sld6ZU05L25uL0NKZzdQN3dDZjhqZWVWSEU0eGZpOFJ1andyUzFBCi0+
+IHNzaC1lZDI1NTE5IE9KUVZEUSBGQnhzb1Z1b2EwTFQvcVVnR0E4Mno5UllzemdF
+eEdTWHAreC84MGdmMDFZCi84UGdhUjRBWWdFUmM2eEpUcktSMWhBZHJUTU1GQjhE
+LzNKZlZqeExERkkKLT4gUXRmSmVcLWdyZWFzZSBlIE40QApTQjJVbjQ0QkpML0VJ
+MnJYN3Fhem9xc1VqcnAyOW5wWUVkNkNDN25EVC9xa0FsUQotLS0gMjh4aHdYZlVl
+c0FCVXVxN2ZxanRpQWRVTTVidHMrdEpuT3YzaElCT2lydwq9/R2plUIsb7E+Jsyr
+ozjfoyXx+nb7sZWLc0j/QcY9kY5apjqGoytcWneLl0gpy85DkSXwH3vnZ4Bc6WYl
+S+v58jWWNY+GPxFpPUuQXIflkt9Wo5FvkD8dOPkn/Vv59sVT3qa0ooMXHyAEZS0V
+-----END AGE ENCRYPTED FILE-----

diff --git a/secrets/allNodes/passwords/katja.age b/secrets/allNodes/passwords/katja.age
@@ -1,26 +1,25 @@
 -----BEGIN AGE ENCRYPTED FILE-----
-YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IFlpZ1k1USBkZmJk
-WC9tOXM4T0g3TklZcXZka0ZRR1kvYXlMTkdBYUtSSUZLaWhxc0VnCm45V1c5aWF3
-UHJVWGkxZnJaMVVuQ1JCdjJVV05jYzErMnhWZ2hhM2o1Y3MKLT4gc3NoLWVkMjU1
-MTkgNGhLQ013IHhZRnMzSVpFQ2ZZMXZrbTljQVlORmhwU2FSUnB4MnNJRUxDUUtV
-SEo1U3MKcU9BMklYU3UwdUl6a2t3NmZwYkJxdTJZVVJ0VGtMNGRvK25zL2p6QVJo
-OAotPiBzc2gtZWQyNTUxOSB5YUxIU1EgR2ZoamRqbDFVTmc4VjJqTTZxTTVMN3Ey
-RW9IZHRXdTFJcmlwVTNaUDFpdwozcTlNcmY2blpXcXppaVBvMlpxRFBSdDNsS0Zi
-OVk1MlJnTzh1cjJ5ejdJCi0+IFgyNTUxOSBvZWZRUFFqUEt1TDQvZVUwa0FNYnMv
-M1lBdE1CNUxFQnE2SlNsYysyRm5RClMraTFhMWxIOE92NDFjQnZTaWM3WjU3anRL
-clY3VVMyWE40aTN0SmVDOVUKLT4gc3NoLWVkMjU1MTkgU1lqNklnIGROd3VOZFVY
-bFpLWC9Mai9mcHN4NnNzbjRWb0ZDc3BBV2UvQTRMRUpHbk0KQUFpdzRBcUs3UzBs
-NHR4MXhFZExDRUFyUkpHTlZCT2RqTzNlTytCRk5LMAotPiBzc2gtZWQyNTUxOSBx
-OG9jemcgbXlvRklVUFptNVBscVZFSWV3aUlaRUxTVjVlWDVpaXkwK1ppYVFGUTZX
-MAp3b1NaOXFBeHd2NnVjTU4vSVVpZmZuZ2VueXlJWk9nQWI0VGlFbE8xQzRvCi0+
-IHNzaC1lZDI1NTE5IE9KUVZEUSA5eUxXRUxrTi9HcmhVWHhVOVVOcGFGYm1OVWsz
-RTlCQW5TTkxuMFFWNURVCjZDUG03U1FEOWFwZHg1WWR0NDNZdEZrMUNKWGdPa2VV
-REs0RlhyWUlyWGcKLT4gSltsQCstZ3JlYXNlIDRSQDpzJi5eIFNNZ3owYihkICl9
-CnJqUk14MEdEUVVYRVZCN0tGSnVUVTdmczJTbTFTQys4cGZodnV6Q1pDTUtBR0Rs
-Z1k2K1VUKzlRZmlFVlpJYzYKNCtwVy9zUFVSNHBjcnZacGczVEZZU3VTdXpmVmkz
-M1c5bGVQOGtPSkJmTmp6TERyeVRQMlJlOEErcHJZK3lxOApJQQotLS0gaVd3eTFy
-MkJZZ2o1SXFybkxtL25mbGZyRUJYdGZGcERyamZIUWFIRDFuVQqqE+JBus3mP/Rb
-ExDSWtmncGt4ZldyxV/shqBMkV7Pq5JNFR89bYzPyOU4yWKZnEzv+yRb+E6UMjuC
-X6TN4oxX5d0imSaEnWZBJYsrO8bTNSuPE5RWbfTwCOwRxfeC05dZtVNNt3utzLnI
-DqpFq+HtNlDadoHZrRalVTngy2w/QG5l5GtfxD2I6po=
+YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IFlpZ1k1USBuV252
+MTgxSW1JYkQxQkwxc2tmN3lldDNPUFg3RVJQdnVQaVRYSXBweDI0CmJZVjFtYUNs
+dTE5U01iUXI0cjBSRGpUT0R0eHVCM0IzcnA0ME9SNHhjMzQKLT4gc3NoLWVkMjU1
+MTkgNGhLQ013IFdCdlFpZHRrU2VxSVI3eUV4dU81MkV0Y1gxaGdqMnhOVlBlVGpX
+aHBPRlEKWGp3QVRKZ2RpQ3Jnc1dqeFZ6dWFHb01uUFkvK3Z6Qm83ZHRpbW5tNWpj
+OAotPiBzc2gtZWQyNTUxOSB5YUxIU1EgVkxJS0ZpNnNodkc1MHhMejdrSW1LK3Fn
+UlhlNUdCTklqT0RQcDZQKzFRNApUZEE3TVUyaHlYRG5BaldFb0p4MlN2bVBSZm40
+eTNjTmdabVBIM0xWR2dJCi0+IFgyNTUxOSBZZVJnYTZoa1E1T1gyTnByb0wwK2to
+L0htMlY3MXBnSHZJSWhySzJLb1ZJCnlmYU1OYnIyRGNIWDNFZCt4Nm5EcWRvd3hy
+WkJjY0liOHFlTmlZYXNPdm8KLT4gc3NoLWVkMjU1MTkgU1lqNklnIGkvaGhiR1FU
+RFdNYlBTY2NaRXR1K0RrVjJTaFNxbGswUFZWUG0rUnhHRFkKbnVhdStEbnQrSjlY
+elBESWN0ZlBzZHVCbG5ZbnFMbkNQWHJPcmU4MzgrUQotPiBzc2gtZWQyNTUxOSBx
+OG9jemcgS1JZKzdyVW9nbnY2Q05Gdmh6eWJ2bW40S3oyQk1PUVR5ZVhlZkYxNWRS
+Ywp3aGVVdjBvdTkwMzJMbUtwYm1qaGdaQndGbWZFZnkwVmlKMHlBUGpFM1VRCi0+
+IHNzaC1lZDI1NTE5IE9KUVZEUSBlSUE5dVd6SmIvamhLelNoYVY4ZXU4N21tQ3FM
+T3pGeEZWTDJCSzRXM1JrCjA5R3pYcXFnNG44aDd6V2YzMUovaUV1L2ZxS2lEVzUz
+NEloV0o2d0VPUDgKLT4gVUxxWS1ncmVhc2UgNiAkOnJwMjlXIE5gWgpxTUg0QVU5
+Z3lRQ2QweTNJbmdoNXFCcXJSL1hZWmFSRWJqUytONmNVUitRZTZzWnR4V2h3Ly9P
+bEZtOXJzcXRDCnNLeW9LZm8KLS0tIFNMVitsTFY2MjE3WFRQK3diK29GVzVMQ2Er
+T1REcDh3VTd4NjlWWnFKcDAK3JOCvy1PciqP0N8crwWDCrFczv8H4UuDsPToKLoL
+f0evHlIecPKJk2LDU8CkhPumN1GsfxGTOi/2Rs4EBYRkG7MjUE1C79Dr2Upf9/X1
+3qux9PoFwK4DTU3nVtBGNZLcDRRrbLiykAQIm+IYsa8ZIMD9MlI79yrNp7k+o2xi
+iAzN4zIjcpbc+mS0
 -----END AGE ENCRYPTED FILE-----

diff --git a/secrets/allNodes/passwords/leah-at-f2k1-de.age b/secrets/allNodes/passwords/leah-at-f2k1-de.age
@@ -1,23 +0,0 @@
------BEGIN AGE ENCRYPTED FILE-----
-YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IFlpZ1k1USBGWVFx
-RStlbzBaaGMvakVxSkQ4VW93UmxkQ2RhcGdTQnRpcjM5Qmp2c1g4Ci9qdVVwZ0NS
-bGxFTEVHSjJFaTRxeVZ4b0xGdjJYd0tFdGhlSUNUWXZxNzgKLT4gc3NoLWVkMjU1
-MTkgNGhLQ013IHNBOHJKQXlXQjNhdzBPcVd4cTJscURoMGJ0dFJzOWVGOFpsYnZB
-a3B2QkEKc01zVTBIUWtiNVJZU1J3ZThkK09OV29FUGhZbVpnRmplN3VBMWcrR1p0
-awotPiBzc2gtZWQyNTUxOSB5YUxIU1Egcnp4OGhJNGRHbEV3OG5TTm1aRUU1aW1q
-b28yUENOaXFmY1ZpYUpUay95QQo1RUpmakFDa0d0REdOMXI1bUgyQWJZNkxycXZR
-ZDJsMzZ1dkcxSW55SkxNCi0+IFgyNTUxOSBwakluMGlHNStRRlZtdVZTd05Rb0xl
-MDQwQnU5emtYQ1dTaEtBQ1VEekd3ClNuaURTNEpXd1VKaDZIL3lqZ1NWTVZMNEky
-ZklOSUgwS0lGNi9aRjQ4SlUKLT4gc3NoLWVkMjU1MTkgU1lqNklnICt3VTVGWStQ
-YmUrd2lZd1djeWIrTDZLaVVNNUpzeHdodXV1ZWlYS2haaFkKekJ3aGN0aWgxOVZx
-UUJhTFRMNFNvaWcrdlppOXpoTVJmQ1E4UnpGWU1hOAotPiBzc2gtZWQyNTUxOSBx
-OG9jemcgbGZVNFQ2TEhFY25zZi9CZjNlaHJ2RUc2aGF0YUZ3bmF4OW4vck5ETGd6
-RQpKRmtqTUJNdmRpNXN3ZEswRVZiQ09jMVl0RDArN1grU29BSVl1UllyalRBCi0+
-IHNzaC1lZDI1NTE5IE9KUVZEUSAyN01raTlBcldwbjlqR0JISEN0akE3ZzFxcVhJ
-a2hNZDdHQ3ZGUVhML0djCmRIR2JaUmNtZ09KZEx2WXE2anE2aHhVcFp0eSt1bXRq
-SFRpZm9rNVg1MEEKLT4gWy5UV2xbLS1ncmVhc2UgLnJoYQowT1MyTzdXL29Dd01K
-NWFDVDkvZDBnb0FRS3J2OTAwVnpsT3QvRG1OVVJycHlHMmpxaDBhNjJ4eXhoUEFH
-T3FQCmU2TDgwUEQwUFNJemhCeTUKLS0tIG44VGNCZXBaQ3NTQkd5SzNYZzNVNHhD
-UVRGem9ZV2tDekJ2YXE0K1ROd0UK+wI/AD7o9LA6/ldR4jhyNwjnJWbhaM0dIgwe
-LYBydR6YG7H1KXDjsyOvmbQLEWyRiQ==
------END AGE ENCRYPTED FILE-----

diff --git a/secrets/allNodes/resticServer/briefkasten.age b/secrets/allNodes/resticServer/briefkasten.age
@@ -1,16 +1,22 @@
 -----BEGIN AGE ENCRYPTED FILE-----
-YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBVb2hydmdWRE1VOUNFNnc3
-NTMzeHl1aUFBaVRMYzlCajFQRjZWMFZUbkRJCkJScUdkaVZWdXByZy90aWxqNk14
-dFM1Z1k2NENQT0ZXbmFESC9aR1dhWjQKLT4gc3NoLWVkMjU1MTkgcThvY3pnIDRP
-K1hVbFB5MG1LeDJ4WmxLeE84QkJDbnI1Q29CbFQvbncxeHB6K3BSQ3cKb0l3Wkwz
-VGZ0aUZuRnhwUVNmaGVwdnRTRVRxVlNUallLY0FSMjFQUEMwRQotPiBzc2gtZWQy
-NTUxOSB5YUxIU1EgQ010alpwaldkQ2JTR29lN29IY3R1NUpUYWFZVzZlNUdYSnlI
-dXBVcDJYNAptd3IyM3ZKK3JpcnN3Y3ZqK2RReGpBdmIwWEJndk1rdGpmNmZaY0hG
-RkpZCi0+IHNzaC1lZDI1NTE5IDRoS0NNdyBQbWhYZDVMVUVNdUNBK1JySXlDODdQ
-UGZUNnV4N3RmYnpKVWNRdVhGTGk4CmNmTlZpYnlBQVJueUVGWFFDcG5uNHRXK1dM
-bk5FREdmdjYrQ0ljK09zR2cKLT4gfVEuNG4kS1otZ3JlYXNlICUKTTVCNlNjQno4
-bHI4RTNUa1Y5UVN2dWxxYUxxWnBjOEEvTFBJd3h5QTNtbUJLaml0d3hwK01KWThn
-TStxUHJJawpkWlFjWGtVY1NrZnVVSjZFMGlRTHNZMGswTjAKLS0tIE1XTmdPNGlO
-SjNtd0FXblB2WTBUeldZUi9ieUYvaDU4MGR1a3Z3eWsyN0EKwmM0Mv7qGW+3+i1v
-xX3yf/yfUkTobMHtt2BArWXN/ySZCrvMXblJG55tDWbOiaco9eE284mzkarG
+YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IFlpZ1k1USByQXJI
+UnljSzZRbmlocnlpb0pJZmNpT1dpUExKTkQ4UXNrL2NKOC85RUZvCmRvTjk1d0FL
+OEt1RVJ0VkdIbHMxL281Tmx6Qk9jQVdXOVlLU0xWYW43b1kKLT4gc3NoLWVkMjU1
+MTkgNGhLQ013IHZKNWplM0o5d3RieE9PS25LT3JVOFUxNzZHNko1Tk5JYXB6R1RH
+cFJDU0EKUi93NlFmUURvQk5PWWw1aDhIYitiOTg3cjFnbXU5ZGcrMjdOWDFORjZ3
+dwotPiBzc2gtZWQyNTUxOSB5YUxIU1EgV2hMQzVOSDVJdXNJWC9WSG5kcHJvd2Fl
+ZDR6TW1wSEZMZnlTeUlGWEpHawo0THNycXJlVGZRelBoeU92UXo0elRZd0UrbXd3
+aU9URmxzRVAxbmY3NUQ0Ci0+IFgyNTUxOSArRDNkeG93RlcyQXBlSER3cjVsVm9X
+Rzc5dWowdWdpdCt5N3NDZ25vZGx3ClZsaWpDNWhlWHkxZ09kL29ZbWdPY0QrN3lu
+Q1A5TTI1U1hzZWp4R041bGcKLT4gc3NoLWVkMjU1MTkgU1lqNklnIHZuY3dITHFu
+U1RudGNrRFhEdXk3YVNCZFIyZlA3MG81djduVllTay9QUzgKNW9wWnRnanlySW8v
+dGhpblJDUWxmdUhHcyt1K01aeVNKRjZJSzdvKzc3TQotPiBzc2gtZWQyNTUxOSBx
+OG9jemcgU2hFanRvL0Npa24yRnBaSHRlRi9JSEh6K0QvczNBWjI1TGE3cWp5Z1Z6
+cwo2dXBUZnI2S1FmdjlxTUQrU3B1Tit1MHI3eFp3RHl0aFZiNVErZjcrR0dJCi0+
+IHNzaC1lZDI1NTE5IE9KUVZEUSBlVGc0ejJqcWs4U3QxQzlvR1pRMHUxNlpCa2VN
+M2gyeFh0NzNlRmJISndJCnlvekU2dnJIdU5aVW40bG1KdXdhSWc5N2s4UzNRMVZX
+WDA1bFIraG9zcFEKLT4gWVoscWpqey1ncmVhc2UKR1dpckVGSnNyOTFFci9NCi0t
+LSA5bmtYWm1DTGhoZDNPR0VQNTJBcHV2VGh2S2tncUUybE1yQmw3L01vMXZvCvk5
+VPz6mYjQmhD2JF+Hsp1ZIB47A99As32HRm4PEtbxeeO/rjx5sebGw1+YImJjQhEc
+S9kqASQ1BQ==
 -----END AGE ENCRYPTED FILE-----

diff --git a/secrets/allNodes/resticServer/wanderduene.age b/secrets/allNodes/resticServer/wanderduene.age
@@ -1,16 +1,23 @@
 -----BEGIN AGE ENCRYPTED FILE-----
-YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBqd2E5WXQ0OWsyTFZOTW85
-SDlGaTRaUGd6M01QajF3LzN6WUR6eWFwZEdFCkpNaW9SbzNUSzNROWgxT05Yamxu
-ODF1K0xycU1pSi93V1pLSDVnbmpjRUkKLT4gc3NoLWVkMjU1MTkgcThvY3pnIE9X
-bWtHeWRyODhEbTdpdUl0VThRYkFDVE9mS05IaDRTREZSNGRwcW85MU0KM2JYV1dB
-elhCVmhtUTA4UHJLU3drVG5zWFZCZ3Vna0NvS01YSXYxNDMxRQotPiBzc2gtZWQy
-NTUxOSB5YUxIU1EgcGZwYU8za0xSQkhPTlNrQ29jQWV5czFadVl0QVpWUUFkUGVw
-ZVpkS0tFWQp4OFk5dG51dG1YOWdhMlRBOUhzN2FMYmo3QjVkakhhTWxLTlJpbHA2
-YzBJCi0+IHNzaC1lZDI1NTE5IDRoS0NNdyBIRnhTSVBJVGgrMXhzRlRldXJwSEVV
-aHdrVy96VXo0dUJpU1ZkNkV2QjFJCllEZ0szei9xVUI0bDZuSklsRFhGakNEZGxj
-YWFpSXMvM0hyalBTcThnTHcKLT4gKiYpM1xZMS1ncmVhc2UgcQp2R3BoamhORGEy
-NnZFSmxmYlV4UjJuTlVEUW1tZnREUAotLS0gOUE3YUVXSjBpb3J4cFBEVTB1TThT
-MFQ3MFV1RUhaRWVYMGRpZUtTMWZzYwppkkLoOvEgc6ib9dmDkMN8TpnsQvTmrOsj
-av8JMvqkZERVqgJdbq8L/O+OZVuactFH5uvzfX9d34xSeaePETAmJMSWhvK4v0yy
-PqZ92bdwqbxqgEDVCCHuM1iBNzNg4k4=
+YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IFlpZ1k1USA4N1lH
+QWdaVWhoSExTcGs1ejlLa2R6Rm5VNkwrQ29wUUI2YW9TUzUxblhvCkJZK2ZxOTJN
+aUowSnplbmxtem8vdXQ2bUNpc2JQeERjSDNuUGhuelRidXcKLT4gc3NoLWVkMjU1
+MTkgNGhLQ013IFAzQ3Nqc1NKN3VNaXArcHJweXFpTnBwSzRvdllPVnpXY213UVl1
+NFpjVWMKTzdYVTZRSFRHV1BseExvbGQrYXJISkFFTm5kTkRZeFBPVXdhQkZSVTZH
+ZwotPiBzc2gtZWQyNTUxOSB5YUxIU1EgekV4MEZMMlNBZVk5VDgwMjdXRkswcjlH
+TlRzM2tiUFl6bHJmeHhXZjhXUQo4UWducTA3WlhibWRsVEMzV2N2eDhvZkNsWUtl
+NFdNeXdqTDNXd1lEeDBBCi0+IFgyNTUxOSBFdzRQQXFSdnZlREVBdXdsZDdIVDFC
+MGpYK3pNZUppTXJubW13SGY0T3lzCkNzL0pKTXJ1MVZidVExTE8yS1pDcGVBN1Uy
+MkZDeTdVcytZZHJ4bzJENXMKLT4gc3NoLWVkMjU1MTkgU1lqNklnIERrVnhzUjZz
+dXRnOTN2NWZBc1FxTE9oOGNWVlhhNDZ4ZVFmQ3hDNm5nZzQKdElwRkFYL2J0OWdP
+eEV4ejg1MlRqQWMvVGdqbTExOGJMTUNWdHIxZktKUQotPiBzc2gtZWQyNTUxOSBx
+OG9jemcgTDRCZ2xQZU5JR0xKWURWUmp2a0ZlUGJzZ3VsZmFnWEZla2xnNFNhYzVR
+cwpWbkFhamRIQXUzSHVoazc0eEIvNUVUbDVDMlFJbGpKNWRDNXlMS1JHZkJBCi0+
+IHNzaC1lZDI1NTE5IE9KUVZEUSBObjBCZi9oWFI0NnlUWWJnRU4vNjhqZWRZZjJm
+elBhWXZVSW05Z1hrbVhnCmdBbFlTRWk5bXRkNHZjclNER09QSzlDaDFkWVNUTkw1
+eWdLOGxrMldSTVUKLT4gNS1ncmVhc2UgNVloLz9kOSBcJ0V6O283IFpCeWNuLwpi
+Q1Fmd1UvN3pZL1paYm8KLS0tIFZibjFNcWRHM0hiZzJ1MU0xL2l0QUc0aUI2Ylkw
+WUdGcFFieGNKcXJ4N2MKgFjUjOhsCQSu/b77R73XQ2pbie8ZKI9OBiIoX7vSB9WG
+5jF5XKkG4DuX9rRwG+eo6+tMNESm/qpnaeFXHESyvRmIsT9E0QktJRV/0gK6s/E5
+lWYo3GptkufnrN9+HQCu
 -----END AGE ENCRYPTED FILE-----