bw/bundles/vsftpd: clean up a bit after fossgis

Author: Kunsi

bundlewrap/bundles/vsftpd/items.py

@@ -1,4 +1,3 @@
-
 files['/etc/vsftpd.conf'] = {
     'triggers': {
         'svc_systemd:vsftpd:restart',
@@ -14,7 +13,7 @@
 files['/etc/vsftpd/ftpd.passwd'] = {
     'content_type': 'mako',
     'context': {
-        'users':node.metadata.get('vsftpd/users'),
+        'users': node.metadata.get('vsftpd/users'),
     },
     'triggers': {
         'svc_systemd:vsftpd:restart',
@@ -28,17 +27,17 @@
 }
 
 for user in node.metadata.get('vsftpd/users'):
-    localroot = node.metadata.get(f'vsftpd/users/{user}/localroot')
-    password =  node.metadata.get(f'vsftpd/users/{user}/password')
-    needs = {}
-    if not node.has_bundle('zfs'):
-        needs = {'zfs_dataset:'}
+    localroot = node.metadata.get(('vsftpd', 'users', user, 'localroot'))
+    password =  node.metadata.get(('vsftpd', 'users', user, 'password'))
 
     directories[localroot] = {
         'owner': 'voc',
         'group': 'voc',
-        'needs': needs,
+        'needs': {
+            f'zfs_dataset:video/vsftpd/{user}',
+        },
     }
+
     files[f'/etc/vsftpd_user_conf/{user}'] = {
         'content': f"local_root={localroot}/",
         'triggers': {

bundlewrap/bundles/vsftpd/metadata.py

@@ -7,25 +7,28 @@
         },
     },
     'vsftpd': {
-        'users': {
+        'users': {},
+    },
+    'zfs': {
+        'datasets': {
+            'video/vsftpd': {
+                'mountpoint': '/srv/vsftpd',
+            },
         },
-        'restrict-to': {
-            "voc-internal",
-            "voc-vpn",
-        }
     },
 }
 
 
 @metadata_reactor.provides(
     'vsftpd/users',
 )
-def autogenerate_sony_camera_config(metadata):
+def autogenerate_some_user_config(metadata):
     users = {}
-    for cam in [1,2,3,4,5,6]:
-        users[f'saal{cam}-sony'] = {
-                'password': repo.vault.human_password_for(f'{node.name} sony {cam}', words=1),
-                'localroot': f'/video/tmp/fossgis2026/sony/saal{cam}',
+    datasets = {}
+    for user in metadata.get('vsftpd/users', {}):
+        users[user] = {
+            'password': repo.vault.human_password_for(f'{node.name} vsftpd user {user}', words=1),
+            'localroot': f'/srv/vsftpd/{user}',
         }
 
     return {
@@ -35,6 +38,24 @@ def autogenerate_sony_camera_config(metadata):
     }
 
 
+@metadata_reactor.provides(
+    'zfs/datasets',
+)
+def zfs(metadata):
+    users = {}
+    datasets = {}
+    for user in metadata.get('vsftpd/users', {}):
+        datasets[f'video/vsftpd/{user}'] = {
+            'mountpoint': metdata.get(('vsftpd', 'users', user, 'localroot')),
+        }
+
+    return {
+        'zfs': {
+            'datasets': datasets
+        }
+    }
+
+
 @metadata_reactor.provides(
     'firewall/port_rules',
 )

bundlewrap/nodes/storage.toml

@@ -72,6 +72,20 @@ webroot = "/video/encoded"
 [metadata.systemd-networkd.bonds.bond0]
 match = ["ens3f0", "ens3f1"]
 
+# TODO migrate from fossgis2026-set passwords to autogenerated ones
+[metadata.vsftpd.users.saal1-sony]
+password = "!decrypt:encrypt$gAAAAABpyqDZC5GyxrfjvosR8jCYX3pAn7ZsaQ2q7ba4IdAFI2snySb7ZkZ4HDSjtIlNHp1e5mdMTZmxz_MVFCFc9RXsnGO4eA=="
+[metadata.vsftpd.users.saal2-sony]
+password = "!decrypt:encrypt$gAAAAABpyqDeqM09gof4YUe83n74-bWqUWIZUi9KyL3goMXgpGvnt_fE-0mAWXoO0ufxrNl8sJEDmb_MK275Bga_SFV_RqtVpQ=="
+[metadata.vsftpd.users.saal3-sony]
+password = "!decrypt:encrypt$gAAAAABpyqDlh-GCAx8DuhPwMD8XRlQ09zxjgzv1TSzUI60Idq92_Ov5FEAFjojsLxq-9Yl25HF7T1A49nI3DvzsYimnUbyovg=="
+[metadata.vsftpd.users.saal4-sony]
+password = "!decrypt:encrypt$gAAAAABpyqDq9FL6srCazA5HIGWyMQ4ZFegjWeIY6FPGifIlbhvkCPnEk0O5hUWM21VC_XMGdVmNfUwAFY18zruBOYO5RIi7TA=="
+[metadata.vsftpd.users.saal5-sony]
+password = "!decrypt:encrypt$gAAAAABpyqDzS71g421zD6qXibvl6dmNikDq8WYnZPqnrQ5REh8sTaP8A0vPTHb1pgZdCZXBr5vKr6iQ2VErSebwZapYOmkx_Q=="
+[metadata.vsftpd.users.saal6-sony]
+password = "!decrypt:encrypt$gAAAAABpyqD4yJF8hWHpymElaxaupzkComOmjhOBs2AmP9BAWolGWhtN01JvWtL-VXX7_9OljEijmIWaGNzJcal2V6cb7VSFCQ=="
+
 [metadata.zfs.module_options]
 zfs_arc_max_gb = 100