From 8434eacd9469e2bc9ed71b60daf83cd328beece6 Mon Sep 17 00:00:00 2001
From: Franziska Kunsmann <hi@kunsmann.eu>
Date: Fri, 18 Feb 2022 22:37:07 +0100
Subject: [PATCH] bundles/{lldp,nfs-server,smartd}: move package dependencies
 to metadata

---
 bundles/lldp/metadata.py       |  8 ++++----
 bundles/nfs-server/metadata.py |  4 ++--
 bundles/smartd/items.py        |  3 ---
 bundles/smartd/metadata.py     | 12 ++++++++++--
 4 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/bundles/lldp/metadata.py b/bundles/lldp/metadata.py
index 4f230ee..cfbee92 100644
--- a/bundles/lldp/metadata.py
+++ b/bundles/lldp/metadata.py
@@ -2,22 +2,22 @@ defaults = {
     'apt': {
         'packages': {
             'lldpd': {
-                'needed_by': [
+                'needed_by': {
                     'directory:/etc/lldpd.d',
                     'file:/etc/lldp.conf',
                     'svc_systemd:lldpd',
-                ],
+                },
             },
         },
     },
     'pacman': {
         'packages': {
             'lldpd': {
-                'needed_by': [
+                'needed_by': {
                     'directory:/etc/lldpd.d',
                     'file:/etc/lldp.conf',
                     'svc_systemd:lldpd',
-                ],
+                },
             },
         },
     },
diff --git a/bundles/nfs-server/metadata.py b/bundles/nfs-server/metadata.py
index c3e3ab7..c389269 100644
--- a/bundles/nfs-server/metadata.py
+++ b/bundles/nfs-server/metadata.py
@@ -4,10 +4,10 @@ defaults = {
     'apt': {
         'packages': {
             'nfs-server': {
-                'needed_by': [
+                'needed_by': {
                     'svc_systemd:nfs-kernel-server',
                     'action:nfs_reload_shares',
-                ],
+                },
             },
         },
     },
diff --git a/bundles/smartd/items.py b/bundles/smartd/items.py
index 4830214..62bdbe7 100644
--- a/bundles/smartd/items.py
+++ b/bundles/smartd/items.py
@@ -12,9 +12,6 @@ files = {
 
 svc_systemd = {
     'smartd': {
-        'needs': {
-            'pkg_apt:smartmontools',
-        },
         'enabled': None, # FIXME this is symlinked to smartmontools.service on bullseye
     },
 }
diff --git a/bundles/smartd/metadata.py b/bundles/smartd/metadata.py
index 00b32aa..bef9390 100644
--- a/bundles/smartd/metadata.py
+++ b/bundles/smartd/metadata.py
@@ -1,8 +1,16 @@
 defaults = {
     'apt': {
         'packages': {
-            'smartmontools': {},
-            'nvme-cli': {},
+            'smartmontools': {
+                'needed_by': {
+                    'svc_systemd:smartd',
+                },
+            },
+            'nvme-cli': {
+                'needed_by': {
+                    'svc_systemd:smartd',
+                },
+            },
         },
     },
     'icinga2_api': {