various bundles: fix dependencies

bundles/lldp/items.py

@@ -1,14 +1,6 @@
-if node.has_bundle('pacman'):
-    package = 'pkg_pacman:lldpd'
-else:
-    package = 'pkg_apt:lldpd'
-
 directories = {
     '/etc/lldpd.d': {
         'purge': True,
-        'needs': {
-            package,
-        },
         'triggers': {
             'svc_systemd:lldpd:restart',
         },
@@ -18,9 +10,6 @@ directories = {
 files = {
     '/etc/lldpd.conf': {
         'delete': True,
-        'needs': {
-            package,
-        },
     },
     '/etc/lldpd.d/bundlewrap.conf': {
         'content_type': 'mako',
@@ -34,7 +23,6 @@ svc_systemd = {
     'lldpd': {
         'needs': {
             'file:/etc/lldpd.d/bundlewrap.conf',
-            package,
         },
     },
 }

bundles/lldp/metadata.py

@@ -1,12 +1,24 @@
 defaults = {
     'apt': {
         'packages': {
-            'lldpd': {},
+            'lldpd': {
+                'needed_by': [
+                    'directory:/etc/lldpd.d',
+                    'file:/etc/lldp.conf',
+                    'svc_systemd:lldpd',
+                ],
+            },
         },
     },
     'pacman': {
         'packages': {
-            'lldpd': {},
+            'lldpd': {
+                'needed_by': [
+                    'directory:/etc/lldpd.d',
+                    'file:/etc/lldp.conf',
+                    'svc_systemd:lldpd',
+                ],
+            },
         },
     },
 }

bundles/nfs-server/items.py

@@ -16,8 +16,5 @@ actions = {
 
 svc_systemd = {
     'nfs-server': {
-        'needs': {
-            'pkg_apt:nfs-kernel-server',
-        },
     },
 }

bundles/nfs-server/metadata.py

@@ -3,7 +3,12 @@ from bundlewrap.metadata import atomic
 defaults = {
     'apt': {
         'packages': {
-            'nfs-kernel-server': {}
+            'nfs-server': {
+                'needed_by': [
+                    'svc_systemd:nfs-kernel-server',
+                    'action:nfs_reload_shares',
+                ],
+            },
         },
     },
 }

nodes/home/rechenmonster.py

@@ -1,18 +1,24 @@
 nodes['home.rechenmonster'] = {
+    'hostname': '172.19.138.98',
     'bundles': {
+        # 'smartd',
+        'basic',
+        'ipmitool',
         'nfs-server',
-        'smartd',
         'systemd',
         'systemd-networkd',
         'systemd-timers',
+        'telegraf',
+        'users',
         'zfs',
     },
     'metadata': {
         'interfaces': {
             'br0': {
                 'ips': {
-                    '172.19.138.98',
+                    '172.19.138.98/24',
                 },
+                'gateway4': '172.19.138.1',
                 'ipv6_accept_ra': True,
             },
         },
@@ -47,6 +53,15 @@ nodes['home.rechenmonster'] = {
                 '/dev/disk/by-id/wwn-0x50025385a01e0795',
             },
         },
+        'users': {
+            'kunsi': {
+                'password': vault.decrypt('encrypt$gAAAAABgLmmuQGRUStrQawoPee-758emIYn2u8-8ebrgzNAFSp7ifeFDdXXvs-zL3QogwNYlCtBHboH2xfy1rSj6OF5bbNO-tg=='),
+                'shell': '/usr/bin/fish',
+            },
+            'sophie': {
+                'password': vault.decrypt('encrypt$gAAAAABiEAyiedXL6ZnvelOMumhcB73X72SXZhjS_G0EDYVK5-NQ3_J_0h1W1HkFBNe5tShGNmg88jUiULRBn5u2IoiRGiDrYg=='),
+            },
+        },
         'zfs': {
             'module_options': {
                 'zfs_arc_max_gb': 16,