From a553e736d1d4f62877108e11946bca084b835751 Mon Sep 17 00:00:00 2001
From: Franziska Kunsmann <hi@kunsmann.eu>
Date: Fri, 16 Oct 2020 17:59:46 +0200
Subject: [PATCH] bundles/powerdns: fix dependencies

---
 bundles/powerdns/items.py | 54 +++++++++++++++++++++++++++------------
 1 file changed, 37 insertions(+), 17 deletions(-)

diff --git a/bundles/powerdns/items.py b/bundles/powerdns/items.py
index 45abff3..2a2aeb2 100644
--- a/bundles/powerdns/items.py
+++ b/bundles/powerdns/items.py
@@ -28,25 +28,23 @@ $TTL 60
         IN  NS  d.ns14.net.
 """
 
-default_attributes = {
-    'needs': {
-        'pkg_apt:pdns-server',
-        'pkg_apt:pdns-backend-bind',
-        'pkg_apt:pdns-backend-pgsql',
-    },
-    'triggers': {
-        'svc_systemd:pdns:restart',
-    },
-}
-
 directories = {
     '/etc/powerdns/pdns.d': {
         'purge': True,
-        **default_attributes,
+        'needs': {
+            'pkg_apt:pdns-server',
+            'pkg_apt:pdns-backend-bind',
+            'pkg_apt:pdns-backend-pgsql',
+        },
+        'triggers': {
+            'svc_systemd:pdns:restart',
+        },
     },
     '/var/lib/powerdns/zones': {
         'purge': True,
-        **default_attributes
+        'needs': {
+            'pkg_apt:pdns-backend-bind',
+        },
     }
 }
 
@@ -56,7 +54,12 @@ files = {
         'context': {
             'api_key': node.metadata['powerdns']['api_key'],
         },
-        **default_attributes,
+        'needs': {
+            'pkg_apt:pdns-server',
+        },
+        'triggers': {
+            'svc_systemd:pdns:restart',
+        },
     },
 }
 
@@ -65,6 +68,9 @@ svc_systemd = {
         'needs': {
             'directory:',
             'file:',
+            'pkg_apt:pdns-server',
+            'pkg_apt:pdns-backend-bind',
+            'pkg_apt:pdns-backend-pgsql',
         },
     },
 }
@@ -90,14 +96,28 @@ if node.metadata['powerdns'].get('features', {}).get('bind', False):
                 'metadata_records': node.metadata.get('powerdns', {}).get('bind-zones', {}).get(zone, {}).get('records', []),
             },
             'source': 'bind-zones/{}'.format(zone),
-            **default_attributes
+            'triggers': {
+                'svc_systemd:pdns:reload',
+            },
         }
 
-    files['/etc/powerdns/pdns.d/bind.conf'] = default_attributes
+    files['/etc/powerdns/pdns.d/bind.conf'] = {
+        'needs': {
+            'pkg_apt:pdns-backend-bind',
+        },
+        'triggers': {
+            'svc_systemd:pdns:restart',
+        },
+    }
     files['/etc/powerdns/named.conf'] = {
         'content_type': 'mako',
         'context': {
             'zones': primary_zones,
         },
-        **default_attributes
+        'needs': {
+            'pkg_apt:pdns-backend-bind',
+        },
+        'triggers': {
+            'svc_systemd:pdns:reload',
+        },
     }