bundles/scansnap/metadata.py

@@ -10,7 +10,7 @@ defaults = {
     },
     'backups': {
         'paths': {
-            '/srv/scansnap',
+            '/src/scansnap',
         },
     },
     'cron': {

data/backup/keys/home.nas.key.vault

@@ -1 +0,0 @@
-encrypt$gAAAAABh27wEndfbW4cyz1fgM3e87zCqStsK8upwR56flNhpwAMJQJtjflH76nvw63cZYGWjJaOY29jO4y8DONjRoe3OQxH1bt9qgBgSfdW4k1A2axKevj67wphrb5bipJCg_EKFZumRONCSaaFDFlRp8DJlwj4LWxHONENx6KEYtMMZyGRUnh853kYDxA9E2gq7ScXZMAws002iD1sBONCsXOLEcpX8-Yt1f9qDzhfSGh4z7JdBa_xfmjKYAMBl62pPeZoI2c8LnogtjPEdblPJmjBuIVhGb_wP6nF4jdEim57v0lGezPblddTFvsgNcZO9AWIeM4ivtVd0AZaZXHXxSh7aGTKOKn6BiZtvah5Dhc61GL-Iga3sXISuG7EALWVODtwfUBwD-s8gAXfT0_LYh2tkrkPVm39Uwx8hM1WZUyDvQ3ox3a5RxQgenz4YskdNA-2Yw53zxdaCp_sORJJPpsFntoPXtw0aHXGVTdluRDtBJCqDPUVvO69J3jDMDnNXb3W9BrKK1CABbZkd5hLQH9jH6ZY8SOZzr5-RpEPbR4akIKPJAL0lcCFRwS0TgCfTAKDBbz9y19xkzIAM4cjraMlUDS69zegryOzG9u1-Cjj82kNKT95iA70Hm63idJWR0naCRUCu

data/backup/keys/home.nas.pub

@@ -1 +0,0 @@
-ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBf2z34n5oovv1PjJrDTNQyrI78oEmazeshLKTwheP4x

data/backup/keys/home.openhab.pub

@@ -1 +1 @@
-ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKYyrgpO2tCRTP+eEFD127OlRIATw7BxaSgYMnyYAbMS
+ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKYyrgpO2tCRTP+eEFD127OlRIATw7BxaSgYMnyYAbMS kunsi@kunsi-t470.kunbox.net

nodes/home/nas.py

@@ -3,7 +3,7 @@
 nodes['home.nas'] = {
     'hostname': '172.19.138.20',
     'bundles': {
-        'backup-client',
+        'backup-server',
         'lm-sensors',
         'mosquitto',
         'nfs-server',
@@ -46,17 +46,14 @@ nodes['home.nas'] = {
             },
         },
         'backups': {
-            'paths': {
-                '/storage/nas/Bilder',
-                '/storage/nas/Bilder_Archiv',
-                '/storage/nas/Musik',
-            },
+            # This *is* the backup server
+            'exclude_from_backups': True,
+        },
+        'backup-server': {
+            'my_hostname': 'franzi-home.kunbox.net',
+            'my_ssh_port': 2022,
+            'zfs-base': 'storage/backups',
         },
-        #'backup-server': {
-        #    'my_hostname': 'franzi-home.kunbox.net',
-        #    'my_ssh_port': 2022,
-        #    'zfs-base': 'storage/backups',
-        #},
         'cron': {
             # Ensure every user is able to read and write to the NAS dataset.
             'nas_permissions': '0 3 * * *    root    '
@@ -304,10 +301,6 @@ nodes['home.nas'] = {
                         'monthly': 0,
                     },
                 },
-                # XXX remove when deleting old backups from node
-                'snapshot_never': {
-                    'storage/backups',
-                }
             },
         },
         'vm': {

nodes/htz-cloud/miniserver.py

@@ -152,7 +152,7 @@ nodes['htz-cloud.miniserver'] = {
             },
         },
         'mautrix-telegram': {
-            'version': 'v0.11.1',
+            'version': 'v0.11.0',
             'homeserver': {
                 'domain': 'sophies-kitchen.eu',
                 'url': 'https://matrix.sophies-kitchen.eu',

nodes/rx300.py

@@ -220,7 +220,7 @@ nodes['rx300'] = {
             },
         },
         'mautrix-telegram': {
-            'version': 'v0.11.1',
+            'version': 'v0.11.0',
             'homeserver': {
                 'domain': 'franzi.business',
                 'url': 'https://matrix.franzi.business',