bundles/backup-server/metadata.py

@@ -16,14 +16,7 @@ defaults = {
             '/usr/bin/rsync',
             '/sbin/zfs',
         },
-    },
+    }
-    'zfs': {
-        'datasets': {
-            'tank': {
-                'recordsize': "1048576",
-            },
-        },
-    },
 }
 
 
@@ -32,7 +25,7 @@ defaults = {
 )
 def zfs(metadata):
     datasets = {}
-
+    
     for other_node in repo.nodes:
         if (
             other_node.has_bundle('backup') and
@@ -49,7 +42,7 @@ def zfs(metadata):
                 'com.sun:auto-snapshot': 'false',
                 'backup': False,
             }
-
+            
             # for rsync backups
             datasets[f'{base_dataset}/fs'] = {
                 'mountpoint': f"/mnt/backups/{id}",
@@ -58,10 +51,10 @@ def zfs(metadata):
                 'com.sun:auto-snapshot': 'true',
                 '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'{base_dataset}/{pool}'] = {
@@ -71,7 +64,7 @@ def zfs(metadata):
                         'com.sun:auto-snapshot': 'false',
                         'backup': False,
                     }
-
+                
                 # actual datasets
                 for path in other_node.metadata.get('backup/paths'):
                     for dataset, config in other_node.metadata.get('zfs/datasets').items():

bundles/backup/files/backup_path_via_zfs

@@ -39,7 +39,7 @@ else
   echo "INCREMENTAL BACKUP"
   last_bookmark=$(zfs list -t bookmark -H -o name | grep "^$source_dataset#$bookmark_prefix" | sort | tail -1 | cut -d '#' -f 2)
   [[ -z "$last_bookmark" ]] && echo "ERROR - last_bookmark is empty" && exit 98
-  $(zfs send -v -L -c -i "#$last_bookmark" "$source_dataset@$new_bookmark" | $ssh sudo zfs recv "$target_dataset")
+  $(zfs send -v -L -i "#$last_bookmark" "$source_dataset@$new_bookmark" | $ssh sudo zfs recv "$target_dataset")
 fi
 
 if [[ "$?" == "0" ]]

bundles/zfs-mirror/files/zfs-mirror

@@ -27,7 +27,7 @@ do
     echo "INCREMENTAL BACKUP"
     last_bookmark=$(zfs list -t bookmark -H -o name | grep "^$dataset#$bookmark_prefix" | sort | tail -1 | cut -d '#' -f 2)
     [[ -z "$last_bookmark" ]] && echo "ERROR - last_bookmark is empty" && exit 98
-    $(zfs send -v -c -L -i "#$last_bookmark" "$dataset@$new_bookmark" | $ssh sudo zfs recv "$dataset" -o mountpoint=none)
+    $(zfs send -v -L -i "#$last_bookmark" "$dataset@$new_bookmark" | $ssh sudo zfs recv "$dataset" -o mountpoint=none)
   fi
 
   if [[ "$?" == "0" ]]

groups/applications/backup.py

@@ -5,9 +5,6 @@
     'metadata': {
         'backup': {
             'server': 'home.backups',
-            'paths': {
-                '/etc',
-            },
         },
     }
 }