From 80142a50527039f4543213b9cd2b07cf0270cecf Mon Sep 17 00:00:00 2001
From: Hunter Haugen <hunter@haugen.email>
Date: Mon, 29 Dec 2025 16:45:21 -0800
Subject: [PATCH] pull-style syncoid

---
 hosts/cryochamber/configuration.nix | 40 ++++++++---------
 hosts/zima/configuration.nix        | 70 ++++++++++++++---------------
 2 files changed, 55 insertions(+), 55 deletions(-)

diff --git a/hosts/cryochamber/configuration.nix b/hosts/cryochamber/configuration.nix
index 867d728..6f7fc18 100644
--- a/hosts/cryochamber/configuration.nix
+++ b/hosts/cryochamber/configuration.nix
@@ -176,26 +176,26 @@
     ];
   };
 
-  #services.syncoid = {
-  #  enable = true;
-  #  user = "backup";
-  #  sshKey = "/var/lib/syncoid/.ssh/id_ed25519";
-  #  commonArgs = [
-  #    #"--sshoption=StrictHostKeyChecking=off"
-  #    "--sshoption=UserKnownHostsFile=/var/lib/syncoid/.ssh/known_hosts"
-  #    "--sshoption=IdentitiesOnly=yes"
-  #  ];
-  #  #commands."zima-bitrot" = {
-  #  #  source = "backup@zima:bitrot";
-  #  #  target = "tank/backups/zima/bitrot";
-  #  #  recursive = true;
-  #  #};
-  #  commands."zima-rpool-safe" = {
-  #    source = "backup@zima:rpool/safe";
-  #    target = "tank/backups/zima/rpool-safe";
-  #    recursive = true;
-  #  };
-  #};
+  services.syncoid = {
+    enable = true;
+    user = "backup";
+    sshKey = "/var/lib/syncoid/.ssh/id_ed25519";
+    commonArgs = [
+      #"--sshoption=StrictHostKeyChecking=off"
+      "--sshoption=UserKnownHostsFile=/var/lib/syncoid/.ssh/known_hosts"
+      "--sshoption=IdentitiesOnly=yes"
+    ];
+    commands."zima-bitrot" = {
+      source = "backup@zima:bitrot";
+      target = "tank/backups/zima/bitrot";
+      recursive = true;
+    };
+    commands."zima-rpool-safe" = {
+      source = "backup@zima:rpool/safe";
+      target = "tank/backups/zima/rpool-safe";
+      recursive = true;
+    };
+  };
   #systemd.services.syncoid-zima-rpool-safe.serviceConfig = {
   #  Environment = [
   #    "HOME=/var/lib/syncoid"
diff --git a/hosts/zima/configuration.nix b/hosts/zima/configuration.nix
index 242c0d4..91d334a 100644
--- a/hosts/zima/configuration.nix
+++ b/hosts/zima/configuration.nix
@@ -181,43 +181,43 @@
       "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDtgW+cxPjo70k6dkYPqzP0FR5G9zvbArp/85ZHRrMRL backup@cryochamber"
     ];
   };
-  services.syncoid = {
-    enable = true;
-    user = "backup";
-    sshKey = "/var/lib/syncoid/.ssh/id_ed25519";
-    commonArgs = [
-      #"--sshoption=StrictHostKeyChecking=off"
-      "--sshoption=UserKnownHostsFile=/var/lib/syncoid/.ssh/known_hosts"
-      "--sshoption=IdentitiesOnly=yes"
-      "--no-sync-snap"
-    ];
-    commands."backup-zima-bitrot" = {
-      source = "bitrot";
-      target = "root@cryochamber:tank/backups/zima/bitrot";
-      recursive = true;
-    };
-    commands."backup-zima-rpool-safe" = {
-      source = "rpool/safe";
-      target = "root@cryochamber:tank/backups/zima/rpool-safe";
-      recursive = true;
-    };
-  };
+  #services.syncoid = {
+  #  enable = true;
+  #  user = "backup";
+  #  sshKey = "/var/lib/syncoid/.ssh/id_ed25519";
+  #  commonArgs = [
+  #    #"--sshoption=StrictHostKeyChecking=off"
+  #    "--sshoption=UserKnownHostsFile=/var/lib/syncoid/.ssh/known_hosts"
+  #    "--sshoption=IdentitiesOnly=yes"
+  #    "--no-sync-snap"
+  #  ];
+  #  commands."backup-zima-bitrot" = {
+  #    source = "bitrot";
+  #    target = "root@cryochamber:tank/backups/zima/bitrot";
+  #    recursive = true;
+  #  };
+  #  commands."backup-zima-rpool-safe" = {
+  #    source = "rpool/safe";
+  #    target = "root@cryochamber:tank/backups/zima/rpool-safe";
+  #    recursive = true;
+  #  };
+  #};
   # This was needed when trying to get the backup user to work instead of using
   # root; probably not needed now
-  systemd.services.syncoid-backup-zima-bitrot.serviceConfig = {
-    Environment = [
-      "HOME=/var/lib/syncoid"
-      "SSH_AUTH_SOCK="
-    ];
-    ExecStartPre = [
-      "+${pkgs.coreutils}/bin/mkdir -p /var/lib/syncoid/.ssh"
-      "+${pkgs.coreutils}/bin/cp /home/backup/.ssh/id_ed25519 /var/lib/syncoid/.ssh/"
-      "+${pkgs.coreutils}/bin/cp /home/backup/.ssh/known_hosts /var/lib/syncoid/.ssh/"
-      "+${pkgs.coreutils}/bin/chown -R backup:syncoid /var/lib/syncoid/.ssh"
-      "+${pkgs.coreutils}/bin/chmod 700 /var/lib/syncoid/.ssh"
-      "+${pkgs.coreutils}/bin/chmod 600 /var/lib/syncoid/.ssh/id_ed25519"
-    ];
-  };
+  #systemd.services.syncoid-backup-zima-bitrot.serviceConfig = {
+  #  Environment = [
+  #    "HOME=/var/lib/syncoid"
+  #    "SSH_AUTH_SOCK="
+  #  ];
+  #  ExecStartPre = [
+  #    "+${pkgs.coreutils}/bin/mkdir -p /var/lib/syncoid/.ssh"
+  #    "+${pkgs.coreutils}/bin/cp /home/backup/.ssh/id_ed25519 /var/lib/syncoid/.ssh/"
+  #    "+${pkgs.coreutils}/bin/cp /home/backup/.ssh/known_hosts /var/lib/syncoid/.ssh/"
+  #    "+${pkgs.coreutils}/bin/chown -R backup:syncoid /var/lib/syncoid/.ssh"
+  #    "+${pkgs.coreutils}/bin/chmod 700 /var/lib/syncoid/.ssh"
+  #    "+${pkgs.coreutils}/bin/chmod 600 /var/lib/syncoid/.ssh/id_ed25519"
+  #  ];
+  #};
 
   services.tailscale.enable = true;