From 9a8e7abef42905347fb6c96a86c4093487f273e2 Mon Sep 17 00:00:00 2001
From: Franziska Kunsmann <hi@kunsmann.eu>
Date: Sat, 12 Feb 2022 18:56:54 +0100
Subject: [PATCH] kunsi-p14s: do backups

---
 bundles/zfs/items.py                  |  2 +-
 data/backup/keys/kunsi-p14s.key.vault |  1 +
 data/backup/keys/kunsi-p14s.pub       |  1 +
 nodes/kunsi-p14s.py                   | 13 +++++++++++++
 4 files changed, 16 insertions(+), 1 deletion(-)
 create mode 100644 data/backup/keys/kunsi-p14s.key.vault
 create mode 100644 data/backup/keys/kunsi-p14s.pub

diff --git a/bundles/zfs/items.py b/bundles/zfs/items.py
index 72d9092..5a6892a 100644
--- a/bundles/zfs/items.py
+++ b/bundles/zfs/items.py
@@ -79,7 +79,7 @@ for name, attrs in node.metadata.get('zfs/datasets', {}).items():
     if 'mountpoint' not in attrs:
         zfs_datasets[name]['canmount'] = 'off'
         zfs_datasets[name]['mountpoint'] = 'none'
-    else:
+    elif 'canmount' not in attrs:
         zfs_datasets[name]['canmount'] = 'on'
 
 for name, attrs in node.metadata.get('zfs/pools', {}).items():
diff --git a/data/backup/keys/kunsi-p14s.key.vault b/data/backup/keys/kunsi-p14s.key.vault
new file mode 100644
index 0000000..f2ee06a
--- /dev/null
+++ b/data/backup/keys/kunsi-p14s.key.vault
@@ -0,0 +1 @@
+encrypt$gAAAAABiB-rPruxytUp5eFUDx-bfXhTHoXbV4E71--i0EFgQxVn0bmgfNrQQL21mAHm9JqSnwtzHxuHW5C_VYXb1vsg6b3lopue3i4XPHZYFe0VU5SDFdKbP2JEQcuMZfYqjN49MxM3bGVkTiErNpf-Ctgf_sop02O_IYNR3fhvD8IST32RUrfqYHPAky9O48pon202bPi10jPMu2dZTevE3ODtBHdiY1Sx7vTzpUiVskXj9H3A3dzywM2w7KpHiUx5sROaOWNZBQ2MASQLfIbAe1mQobCpySKsMNhbxmpTO2Cg75a8tLbtTicrzwU9DB8HOLn5L3ed-K1bPpP57_bWrxl9_Jrvgu6PgDB8b1PTInycej8o7zZKF-UTi1aGcjJAvSRymWDb045WBQs3HIJJuBlKoHwjMUN7Vw9u1JqooTSmJWFql3pdIlhR3YZxTe5wrT1jxHeyxKPk7YlNqcj6nlK8v9QT9w24IdF0yekVl_HVnFgZ4EQ_DH_wdKTnAJWLOMkqYjlFCz0HS_IOF-X3oPr8UcbXzQ6dtcJAh3nR6kJRUIfifzEk0hBkZZ8axiDt2KFFYLqv5SM5TmtRuxeJq38Eqa-uv62w2_lJZiLQ6wFHR7UoGgBexp65vGe3cDnN7j1fPXgGo
\ No newline at end of file
diff --git a/data/backup/keys/kunsi-p14s.pub b/data/backup/keys/kunsi-p14s.pub
new file mode 100644
index 0000000..636ca3f
--- /dev/null
+++ b/data/backup/keys/kunsi-p14s.pub
@@ -0,0 +1 @@
+ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGDTtww1OWI29zxXpUANToHzzBR/Kp0Jqpii0+JUr3MY kunsi@kunsi-p14s.kunbox.net
diff --git a/nodes/kunsi-p14s.py b/nodes/kunsi-p14s.py
index fd3d3c3..82991ce 100644
--- a/nodes/kunsi-p14s.py
+++ b/nodes/kunsi-p14s.py
@@ -2,6 +2,7 @@ nodes['kunsi-p14s'] = {
     'hostname': 'localhost',
     'bundles': {
         'arch-with-gui',
+        'backup-client',
         'lldp',
         'lm-sensors',
         #'nfs-client',
@@ -131,6 +132,18 @@ nodes['kunsi-p14s'] = {
             },
         },
         'zfs': {
+            'datasets': {
+                # this is not a complete list, but we can't create that
+                # structure using bundlewrap anyway, so there's no point
+                # in adding it here.
+                'zroot/system/root': {
+                    'canmount': 'noauto',
+                    'mountpoint': '/',
+                },
+                'zroot/user/kunsi': {
+                    'mountpoint': '/home/kunsi',
+                },
+            },
             'snapshots': {
                 'retain_per_dataset': {
                     'zroot/user/kunsi': {