fix: off1 distinct backups datasets for off and proxmox

openfoodfacts · Mar 14, 2024 · a8210a6 · a8210a6
1 parent 1ea7e6a
commit a8210a6
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 10 deletions.
diff --git a/confs/off1/sanoid/sanoid.conf b/confs/off1/sanoid/sanoid.conf
@@ -1,6 +1,6 @@
 # sanoid conf data - see https://github.com/jimsalterjrs/sanoid/wiki/Sanoid
 #
-# no_sanoid_checks: zfs-hdd:zfs-hdd/backups:zfs-nvme
+# no_sanoid_checks: zfs-hdd:zfs-nvme
 
 
 # backup of PVE containers data
@@ -51,17 +51,20 @@
   use_template=synced_data
   recursive=yes
 
-[zfs-hdd/backups/off2-pve]
-  use_template=synced_sys
+# proxmox backups
+[zfs-hdd/backups]
+  use_template=local_sys
   recursive=yes
 
-[zfs-hdd/backups/off2-pve-nvme]
+[zfs-hdd/off-backups]
+  # for this parent dataset only,
+  # before recursive definition
+  use_template=local_sys
+[zfs-hdd/off-backups]
   use_template=synced_sys
   recursive=yes
+  recursive=no
 
-[zfs-hdd/backups/off2-rpool]
-  use_template=synced_sys
-  recursive=yes
 
 # Template for production data volume
 [template_local_data]

diff --git a/confs/off1/sanoid/syncoid-args.conf b/confs/off1/sanoid/syncoid-args.conf
@@ -12,7 +12,7 @@
 # opff
 --no-sync-snap --no-privilege-elevation --recursive [email protected]:zfs-hdd/opff zfs-hdd/opff
 # off2 rpool backups
---no-sync-snap --no-privilege-elevation --recursive [email protected]:rpool zfs-hdd/backups/off2-rpool
+--no-sync-snap --no-privilege-elevation --recursive [email protected]:rpool zfs-hdd/off-backups/off2-rpool
 # off2 pve backups
---no-sync-snap --no-privilege-elevation --recursive [email protected]:zfs-hdd/pve zfs-hdd/backups/off2-pve
---no-sync-snap --no-privilege-elevation --recursive [email protected]:zfs-nvme/pve zfs-hdd/backups/off2-pve-nvme
+--no-sync-snap --no-privilege-elevation --recursive [email protected]:zfs-hdd/pve zfs-hdd/off-backups/off2-pve
+--no-sync-snap --no-privilege-elevation --recursive [email protected]:zfs-nvme/pve zfs-hdd/off-backups/off2-pve-nvme