From 5f3230aad459d06cfd257616564bddc4cd9ad7cc Mon Sep 17 00:00:00 2001
From: Christian Pointner <equinox@spreadspace.org>
Date: Tue, 11 Jan 2022 00:04:35 +0100
Subject: zfs/syncoid: add error handling to pull

---
 roles/storage/zfs/syncoid/tasks/main.yml | 31 ++++++++++---------------------
 1 file changed, 10 insertions(+), 21 deletions(-)

(limited to 'roles/storage/zfs/syncoid/tasks')

diff --git a/roles/storage/zfs/syncoid/tasks/main.yml b/roles/storage/zfs/syncoid/tasks/main.yml
index 738b7041..9e573db7 100644
--- a/roles/storage/zfs/syncoid/tasks/main.yml
+++ b/roles/storage/zfs/syncoid/tasks/main.yml
@@ -16,12 +16,10 @@
     type: ed25519
     comment: ZFS Backup syncoid@{{ host_name }}
 
-- name: generate syncoid ssh config wrapper
-  copy:
-    content: |
-      #!/bin/bash
-      exec /usr/sbin/syncoid --sshoption "UserKnownHostsFile=/var/lib/syncoid/ssh.knownhosts" --sshoption "HashKnownHosts=no" --sshkey "/var/lib/syncoid/id_ssh_ed25519" --no-sync-snap --compress zstd-fast "$@"
-    dest: /var/lib/syncoid/syncoid_wrapper
+- name: generate syncoid pull script
+  template:
+    src: syncoid_pull.j2
+    dest: /var/lib/syncoid/syncoid_pull
     mode: 0755
 
 - name: configure lvm to ignore zfs volumes
@@ -81,21 +79,6 @@
         Persistent=false
       dest: /etc/systemd/system/sanoid.timer.d/no-persistence.conf
 
-  - name: generate syncoid post script
-    copy:
-      content: |
-        #!/bin/bash
-
-        echo "running sanoid --prune to cleanup old snapshots"
-        sleep 5
-        systemctl start --wait sanoid-prune.service
-
-        echo "wait 30s (autosuspend cooldown period)"
-        sleep 30
-        echo "done."
-      dest: /var/lib/syncoid/syncoid_post
-      mode: 0755
-
   - name: install python deps
     apt:
       name: "{{ python_basename }}-dbus"
@@ -121,3 +104,9 @@
       name: syncoid-autosuspend.timer
       enabled: yes
       state: started
+
+- name: generate syncoid finalize script
+  template:
+    src: syncoid_finalize.j2
+    dest: /var/lib/syncoid/syncoid_finalize
+    mode: 0755
-- 
cgit v1.2.3