From 393aee068f6f3d15c49be2f37e0e91974c5c598e Mon Sep 17 00:00:00 2001
From: mwiegand <mwiegand@seibert-media.net>
Date: Mon, 13 Sep 2021 10:41:00 +0200
Subject: [PATCH] wip

---
 bundles/backup/metadata.py     | 2 +-
 bundles/nextcloud/metadata.py  | 4 ++--
 bundles/postfix/metadata.py    | 4 ++--
 bundles/postgresql/metadata.py | 6 +++---
 bundles/telegraf/metadata.py   | 4 ++--
 bundles/zfs/metadata.py        | 4 ++--
 6 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/bundles/backup/metadata.py b/bundles/backup/metadata.py
index 843f8da..e04e502 100644
--- a/bundles/backup/metadata.py
+++ b/bundles/backup/metadata.py
@@ -7,7 +7,7 @@ defaults = {
     },
     'backup': {
         'server': None,
-        'paths': [],
+        'paths': {},
     },
     'systemd-timers': {
         f'backup': {
diff --git a/bundles/nextcloud/metadata.py b/bundles/nextcloud/metadata.py
index c9b2440..642c536 100644
--- a/bundles/nextcloud/metadata.py
+++ b/bundles/nextcloud/metadata.py
@@ -32,9 +32,9 @@ defaults = {
         },
     },
     'backup': {
-        'paths': [
+        'paths': {
             '/etc/nextcloud/config.php',
-        ],
+        },
     },
     'nextcloud': {
         'admin_user': 'admin',
diff --git a/bundles/postfix/metadata.py b/bundles/postfix/metadata.py
index 5f3e8df..91cf74a 100644
--- a/bundles/postfix/metadata.py
+++ b/bundles/postfix/metadata.py
@@ -6,9 +6,9 @@ defaults = {
         }
     },
     'backup': {
-        'paths': [
+        'paths': {
             '/var/vmail',
-        ],
+        },
     },
     'letsencrypt': {
         'reload_after': {
diff --git a/bundles/postgresql/metadata.py b/bundles/postgresql/metadata.py
index 4cb476d..764c9b8 100644
--- a/bundles/postgresql/metadata.py
+++ b/bundles/postgresql/metadata.py
@@ -7,9 +7,9 @@ defaults = {
         },
     },
     'backup': {
-        'paths': [
+        'paths': {
             '/var/lib/postgresql',
-        ],
+        },
     },
     'postgresql': {
         'roles': {
@@ -20,7 +20,7 @@ defaults = {
         },
         'databases': {},
     },
-    'grafana_rows': [],
+    'grafana_rows': {},
 }
 
 if node.has_bundle('zfs'):
diff --git a/bundles/telegraf/metadata.py b/bundles/telegraf/metadata.py
index 228d788..f028a1b 100644
--- a/bundles/telegraf/metadata.py
+++ b/bundles/telegraf/metadata.py
@@ -50,12 +50,12 @@ defaults = {
             },
         },
     },
-    'grafana_rows': [
+    'grafana_rows': {
         'cpu',
         'mem',
         'disk_io',
         'net_io',
-    ],
+    },
 }
 
 
diff --git a/bundles/zfs/metadata.py b/bundles/zfs/metadata.py
index 6ad54a6..955f953 100644
--- a/bundles/zfs/metadata.py
+++ b/bundles/zfs/metadata.py
@@ -103,10 +103,10 @@ def dataset_defaults(metadata):
 def backup(metadata):
     return {
         'backup': {
-            'paths': [
+            'paths': {
                 options['mountpoint']
                     for options in metadata.get('zfs/datasets').values()
                     if options.get('backup', True)
-            ],
+            },
         },
     }