From da2236a6cdc30ab822433fb8550f32d0c7b85ee1 Mon Sep 17 00:00:00 2001
From: Wojciech Kozlowski <wk@wojciechkozlowski.eu>
Date: Sun, 30 Oct 2022 16:21:07 +0100
Subject: [PATCH] Rename service-data to volume-data for syncoid

---
 .../common/etc/logcheck/ignore.d.server/_hostname.j2   |  2 +-
 ...-data.service.j2 => syncoid-volume-data.service.j2} |  3 ++-
 playbooks/tasks/backups/00-zfs-snapshots.yml           | 10 +++++-----
 3 files changed, 8 insertions(+), 7 deletions(-)
 rename playbooks/filesystem/yggdrasil/etc/systemd/system/{syncoid-service-data.service.j2 => syncoid-volume-data.service.j2} (78%)

diff --git a/playbooks/filesystem/common/etc/logcheck/ignore.d.server/_hostname.j2 b/playbooks/filesystem/common/etc/logcheck/ignore.d.server/_hostname.j2
index 988c74d..ad7e7e4 100644
--- a/playbooks/filesystem/common/etc/logcheck/ignore.d.server/_hostname.j2
+++ b/playbooks/filesystem/common/etc/logcheck/ignore.d.server/_hostname.j2
@@ -9,4 +9,4 @@
 ^[[:alpha:]]{3} [ :[:digit:]]{11} [._[:alnum:]\-]+ syncoid\[[0-9]+\]: INFO: .*$
 ^[[:alpha:]]{3} [ :[:digit:]]{11} [._[:alnum:]\-]+ syncoid\[[0-9]+\]: NEWEST SNAPSHOT: .*$
 ^[[:alpha:]]{3} [ :[:digit:]]{11} [._[:alnum:]\-]+ syncoid\[[0-9]+\]: Sending incremental .*$
-^[[:alpha:]]{3} [ :[:digit:]]{11} [._[:alnum:]\-]+ systemd\[[0-9]+\]: Finished (Snapshot ZFS filesystems|Prune ZFS snapshots|Replicate service data snapshots)\.$
+^[[:alpha:]]{3} [ :[:digit:]]{11} [._[:alnum:]\-]+ systemd\[[0-9]+\]: Finished (Snapshot ZFS filesystems|Prune ZFS snapshots|Replicate volume data snapshots)\.$
diff --git a/playbooks/filesystem/yggdrasil/etc/systemd/system/syncoid-service-data.service.j2 b/playbooks/filesystem/yggdrasil/etc/systemd/system/syncoid-volume-data.service.j2
similarity index 78%
rename from playbooks/filesystem/yggdrasil/etc/systemd/system/syncoid-service-data.service.j2
rename to playbooks/filesystem/yggdrasil/etc/systemd/system/syncoid-volume-data.service.j2
index 4dae54b..a03dc5c 100644
--- a/playbooks/filesystem/yggdrasil/etc/systemd/system/syncoid-service-data.service.j2
+++ b/playbooks/filesystem/yggdrasil/etc/systemd/system/syncoid-volume-data.service.j2
@@ -1,7 +1,8 @@
 [Unit]
-Description=Replicate service data snapshots
+Description=Replicate volume data snapshots
 Documentation=man:syncoid(8)
 After=sanoid.service
+Before=sanoid-prune.service
 
 [Service]
 Type=oneshot
diff --git a/playbooks/tasks/backups/00-zfs-snapshots.yml b/playbooks/tasks/backups/00-zfs-snapshots.yml
index b83bec2..2ede2d9 100644
--- a/playbooks/tasks/backups/00-zfs-snapshots.yml
+++ b/playbooks/tasks/backups/00-zfs-snapshots.yml
@@ -15,20 +15,20 @@
 
 - name: Copy service for {{ ansible_hostname }} data replication
   template:
-    src: ./filesystem/{{ ansible_hostname }}/etc/systemd/system/syncoid-service-data.service.j2
-    dest: /etc/systemd/system/syncoid-service-data.service
+    src: ./filesystem/{{ ansible_hostname }}/etc/systemd/system/syncoid-volume-data.service.j2
+    dest: /etc/systemd/system/syncoid-volume-data.service
     mode: 0644
-  register: systemd_syncoid_service_data_service_file
+  register: systemd_syncoid_volume_data_service_file
 
 - name: SystemD daemon reload
   systemd:
     daemon_reload: true
   when:
-    systemd_syncoid_service_data_service_file is changed
+    systemd_syncoid_volume_data_service_file is changed
 
 - name: Enable the replication service
   systemd:
-    name: syncoid-service-data.service
+    name: syncoid-volume-data.service
     enabled: yes
 
 - name: Enable the sanoid timer