bundles/backup-server/metadata.py

@@ -40,16 +40,9 @@ def zfs(metadata):
                 'readonly': 'off',
                 'backup': False,
             }
+            
             # for zfs send/recv
             if other_node.has_bundle('zfs'):
-                # base datasets for each tank
-                for pool in other_node.metadata.get('zfs/pools'):
-                    datasets[f"tank/{other_node.metadata.get('id')}/{pool}"] = {
-                        'mountpoint': None,
-                        'readonly': 'on',
-                        'backup': False,
-                    }
-                # actual datasets
                 for path in other_node.metadata.get('backup/paths'):
                     for dataset, config in other_node.metadata.get('zfs/datasets').items():
                         if path == config.get('mountpoint'):

bundles/backup/files/backup_path_via_zfs

@@ -45,7 +45,7 @@ fi
 if [[ "$?" == "0" ]]
 then
   zfs bookmark "$source_dataset@$new_bookmark" "$source_dataset#$new_bookmark"
-  #zfs destroy "$source_dataset@$new_bookmark" # keep snapshots?
+  zfs destroy "$source_dataset@$new_bookmark"
   echo "SUCCESS"
 else
   zfs destroy "$source_dataset@$new_bookmark"

bundles/backup/metadata.py

@@ -1,16 +1,8 @@
 defaults = {
     'apt': {
         'packages': {
-            'jq': {
-                'needed_by': {
-                    'svc_systemd:backup.timer',
-                },
-            },
-            'rsync': {
-                'needed_by': {
-                    'svc_systemd:backup.timer',
-                },
-            },
+            'jq': {},
+            'rsync': {},
         },
     },
     'backup': {

nodes/home.openhab.py

@@ -1,10 +1,9 @@
 {
     'hostname': '10.0.0.17',
     'groups': [
-        'backup',
+        'raspberry-pi',
         'debian-11',
         'monitored',
-        'raspberry-pi',
         'webserver',
     ],
     'bundles': [
@@ -40,7 +39,7 @@
             'pools': {
                 'tank': {
                     'devices': [
-                        '/dev/mmcblk1p3',
+                        '/dev/sda',
                     ],
                 },
             },

requirements.txt

@@ -1,4 +1,4 @@
-bundlewrap>=4.13.1
+bundlewrap>=4.13.0
 pycryptodome
 PyNaCl
 PyYAML