migrate to new rsync.net host

hosts/chunk/default.nix

@@ -80,7 +80,7 @@
       owner = config.users.users.git.name;
     };
     "rsyncnet/id_ed25519" = {
-      sopsFile = ../../secrets/de3911/chunk.yaml;
+      sopsFile = ../../secrets/zh5061/chunk.yaml;
     };
     "attic/env" = {
       sopsFile = ../../secrets/services/attic.yaml;

hosts/titan/default.nix

@@ -30,7 +30,7 @@
       sopsFile = ../../secrets/borg/titan.yaml;
     };
     "rsyncnet/id_ed25519" = {
-      sopsFile = ../../secrets/de3911/titan.yaml;
+      sopsFile = ../../secrets/zh5061/titan.yaml;
     };
   };
 

hosts/ytnix/default.nix

@@ -33,7 +33,7 @@
       sopsFile = ../../secrets/wireguard/yt.yaml;
     };
     "rsyncnet/id_ed25519" = {
-      sopsFile = ../../secrets/de3911/yt.yaml;
+      sopsFile = ../../secrets/zh5061/yt.yaml;
     };
     "newsboat/miniflux" = {
       sopsFile = ../../secrets/newsboat.yaml;

modules/backup.nix

@@ -52,7 +52,7 @@ in
     };
     repo = lib.mkOption {
       type = lib.types.str;
-      description = "Borg repository to backup to. This is appended to `de3911@de3911.rsync.net:borg/`.";
+      description = "Borg repository to backup to. This is appended to `zh5061@zh5061.rsync.net:borg/`.";
     };
     startAt = lib.mkOption {
       type = lib.types.str;
@@ -76,7 +76,7 @@ in
   config = lib.mkIf cfg.enable {
     programs.ssh.knownHostsFiles = [
       (pkgs.writeText "rsyncnet-keys" ''
-        de3911.rsync.net ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIObQN4P/deJ/k4P4kXh6a9K4Q89qdyywYetp9h3nwfPo
+        zh5061.rsync.net ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJtclizeBy1Uo3D86HpgD3LONGVH0CJ0NT+YfZlldAJd
       '')
     ]; # needs to be a list
 
@@ -87,7 +87,7 @@ in
       persistentTimer = true;
       paths = defaultPaths ++ cfg.paths;
       exclude = defaultExclude ++ cfg.exclude;
-      repo = "de3911@de3911.rsync.net:borg/" + cfg.repo;
+      repo = "zh5061@zh5061.rsync.net:borg/" + cfg.repo;
       encryption = {
         mode = "repokey-blake2";
         passCommand = "cat ${cfg.passFile}";
@@ -96,6 +96,7 @@ in
         BORG_RSH = "ssh -i ${cfg.sshKeyFile}";
         BORG_REMOTE_PATH = "borg1";
         BORG_EXIT_CODES = "modern";
+        BORG_RELOCATED_REPO_ACCESS_IS_OK = "yes";
       };
       compression = "auto,zstd,8";
       extraCreateArgs = [

secrets/rclone.yaml

@@ -1,5 +1,5 @@
 rclone:
-    config: ENC[AES256_GCM,data:mvbvhlePt87lZl5AWyq5l0hwop4wHdY5pY82EMyzz+KtW7DKmi/3txVuNJ/GjcDWIY9HxklDDrIbN/r+prVvl/OEquHg+YLn/0w7njWDsqIEO+GwDCUBAaZqZtc94LVkI4SYXuE1Jl5wyWy0qaqkvR3kd91bC5ABoTKXnr2yxiTIIH9M2QyXMYy2/zDI3Ux6t5+vO6kze/d1kVmxpzzNyYrPDflQgR4o94P0hDAsnOJa2MW9S10mIsOU5h61IuILm5XHWgTAgNiyEGVA/nFOsu1Ny8bUXCcWtwWNZkNmkkL7lgIpnzbm09DmKWHn18I9+nyWaYxmuKn/g9rxPPBduzg77CHyLtQv55ZI+5hsZrkPHKfoMqJrjkz3zCU/XplCrR21cHVM1Yo1LRDWcCrIzmNQiqTzBHY0QGuLPqdYtG3mcLrwwuBE8uvQt3YJ7FQHuq8vERHsq/PHBigndstGvXpfkQmn33/tAZCBPvZEKHakJ9bFyol/lPm+sbOIAaCqf0FFDSL5l3m0PiUHfZRPTS8bm+rTNPfQBclFGbwmNmvofxsCcbnJEZpqRBK38tMOp08cBjcKGyyb21Wpy8Qx1igWOVb71Rn13VfCdYFO4JoLVAX1r9uI8b3kW4qOMYY66iEnBCLbgK+81Dk+bzy+ilWQQiTYuW/lo+Dx4vPoLfIwVmgo3ooY282t0huxCi2edjq9llo+NOd63o8yNKhbAJlBPAigqAA53aqndLUka17CwXKKhT+k+zChu/ZlkQ6viPo6HJq+1rymYoK4KUrjTvXiAr+8eYpT/qJ2tTK7rCysFZhGuRlwP1Xk5z0=,iv:WXPH8jBHdqM2TL8xtFmvvXujmaNYR6AKlyJgfYVRf44=,tag:60WucstY5TAq+B8GrIOQfA==,type:str]
+    config: ENC[AES256_GCM,data:/GFMFowcU2940P3n/4qQEmAflNyn/s7kujrv1SmStpsVfoiqklD0aB77wh2n7nxzL+Yg98e+L1MADSUTkc1e1uAfc6NwhB62HzKuEvZwCCRs/WZas8ZMuB5cVQUtxl1kRoqLWVxUaaVQU/qsjEFj4uA/dnOe/PSR9DYOnAA7PiHFFP4rtD0/tfhsdjNUiKY62n/yVDRTNJmQ7f14jR2OPby65Xu6Upi77XvOeFDy6LMyOcAH8UF9QTw5+4r5nosOA+H9SFc4Y+BAVnboBi7McrLYtz9SAiaYFQAqT4/nbNSSfvdnvuMSNMxpW88L/UnRxtEHfAYCEyUQD+GaDIEt2vSRQLWHJB6znMxnMXi5U/S9gCP7/NdcSvCh9SkrnHmRW9dQg3euGkuaVkpiYQoORyzk7RrxjFOKHCpU4gaaLD6FBrkkJHY8zDL/176aZKBgIpFaHlQN/TVwEByVDEUfEZ4Z+Af528rBjZ/W8gV9kgYzBECQ8Mgw5/HVSwO1fvVuFQedV5pz/TxIrd9V1t1W8XDN9UYgnfctQDch2oQMA1iCVuV2Mm7I8Ew4ikNeCy5qBgBq3MfDSlpCmqeiqSuCR1V0O7FeyWgV46cm+ORVCgkAvYUH9xy8ARYEVRjK1aogjFwc+e8GhK976fvI1Lt9aE6c87AdJd58kP/LiS0So6d4VWfTZUNX1sdpZA7y2G5oSu7PRGfR94unzqzmRhbMPACvKnoLPUnod8Sw93vLu7y+QGI9zl4oICPT8GF8k1kfVdqGLWjB5i91RAJInbpkG3jeHciE3I7RC2gVNufdEmkpRx2bt7kLw30ede0=,iv:V+Kd3HRD6kfM8TTjBbmc/uQbo2iafDV5u6FtnhFSTQs=,tag:e9WX+hD2UNvnsQhCuMebUA==,type:str]
 sops:
     kms: []
     gcp_kms: []
@@ -33,8 +33,8 @@ sops:
             aExPM3ZCL0kvMWpZZlFuTGMvU0pQNEEKTxkA30B3nPOO1Q0ZRiZZKicqvEpJoOL5
             B/PchzkTvSbjPGz55r+Qq3oTHTQ4bwxpZ7T1hMyMcXhws+oftol5/g==
             -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2024-12-30T21:01:01Z"
-    mac: ENC[AES256_GCM,data:K9HJyxbipXb9oAiJQH+pm8hwQd6TqkJbOflFJDO1AoejYeJB5qyeGYmEgQ2l4sBmKrGetiyG5+qOaAPrKZoLeqtwyM8SxnLDUQ8dQLzEHnHGixlilkLyI4AxlznvkfVvcSjOfughVb2G4N5xIcaIWLT1+zAiweb7hoB55LGOSG8=,iv:xt1DXi4ZhIBPO9o5m4Uf8Z6B7SmbU3FGuvp5t+WgJns=,tag:WFACS8fCHOvNBAWXHZoD6A==,type:str]
+    lastmodified: "2025-01-06T23:47:39Z"
+    mac: ENC[AES256_GCM,data:Yg/CiK3pZL+RPYHFVIMZj4pmDzenOpYj8slK/XL28+5IdQ/BBIETXgCz0JjN7p7li2sYGMnKv5DDa6NhCYOGhexmTxKzumAAjYNLrZamDaDBxXs+FnN6cBxytM2eEc+GFBazl0nEPPBulZNoDsFK1TpIFnMAClVjRe1y37cNXXQ=,iv:Rlxci8NVLzF9yDro30mDkymyiv30slcLKYCMIZv3y+o=,tag:a+m9ZcA/ttxiR/JXUPLfSQ==,type:str]
     pgp: []
     unencrypted_suffix: _unencrypted
     version: 3.9.2