From 487899ae3ebd0019c689971c3d41b5ccee786622 Mon Sep 17 00:00:00 2001
From: mwiegand <mwiegand@seibert-media.net>
Date: Wed, 10 Nov 2021 02:12:50 +0100
Subject: [PATCH] systemd-journald bundle

---
 bundles/raspberry-pi/metadata.py     |  6 ++----
 bundles/systemd-journald/items.py    | 14 ++++++++++++++
 bundles/systemd-journald/metadata.py |  3 +++
 bundles/systemd/items.py             | 15 ---------------
 bundles/systemd/metadata.py          |  1 -
 groups/os/linux.py                   |  1 +
 6 files changed, 20 insertions(+), 20 deletions(-)
 create mode 100644 bundles/systemd-journald/items.py
 create mode 100644 bundles/systemd-journald/metadata.py

diff --git a/bundles/raspberry-pi/metadata.py b/bundles/raspberry-pi/metadata.py
index 368b041..1b877e1 100644
--- a/bundles/raspberry-pi/metadata.py
+++ b/bundles/raspberry-pi/metadata.py
@@ -4,10 +4,8 @@ defaults = {
     'grafana_rows': {
         'health',
     },
-    'systemd': {
-        'journald.conf': {
-            'Storage': 'volatile',
-        },
+    'systemd-journald': {
+        'Storage': 'volatile',
     },
 }
 
diff --git a/bundles/systemd-journald/items.py b/bundles/systemd-journald/items.py
new file mode 100644
index 0000000..b2639d8
--- /dev/null
+++ b/bundles/systemd-journald/items.py
@@ -0,0 +1,14 @@
+files = {
+    '/etc/systemd/journald.conf.d/managed.conf': {
+        'content': repo.libs.systemd.generate_unitfile({
+                'Jorunal': node.metadata.get('systemd-journald'),
+        }),
+        'triggers': {
+            'svc_systemd:systemd-journald:restart',
+        },
+    }
+}
+
+svc_systemd = {
+    'systemd-journald': {},
+}
diff --git a/bundles/systemd-journald/metadata.py b/bundles/systemd-journald/metadata.py
new file mode 100644
index 0000000..92cd96f
--- /dev/null
+++ b/bundles/systemd-journald/metadata.py
@@ -0,0 +1,3 @@
+defaults = {
+    'systemd-journald': {}
+}
diff --git a/bundles/systemd/items.py b/bundles/systemd/items.py
index 2d7c4f2..c7fab56 100644
--- a/bundles/systemd/items.py
+++ b/bundles/systemd/items.py
@@ -1,20 +1,5 @@
 from bundlewrap.utils.dicts import merge_dict
 
-files = {
-    '/etc/systemd/journald.conf.d/managed.conf': {
-        'content': repo.libs.systemd.generate_unitfile({
-                'Jorunal': node.metadata.get('systemd/journald.conf'),
-        }),
-        'triggers': {
-            'svc_systemd:systemd-journald:restart',
-        },
-    }
-}
-
-svc_systemd = {
-    'systemd-journald': {},
-}
-
 actions = {
      'systemd-reload': {
         'command': 'systemctl daemon-reload',
diff --git a/bundles/systemd/metadata.py b/bundles/systemd/metadata.py
index 0df2fa3..d8fb272 100644
--- a/bundles/systemd/metadata.py
+++ b/bundles/systemd/metadata.py
@@ -2,7 +2,6 @@ defaults = {
     'systemd': {
         'units': {},
         'services': {},
-        'journald.conf': {},
     }
 }
 
diff --git a/groups/os/linux.py b/groups/os/linux.py
index c9abd15..9f4052c 100644
--- a/groups/os/linux.py
+++ b/groups/os/linux.py
@@ -9,6 +9,7 @@
         'network',
         'ssh',
         'systemd',
+        'systemd-journald',
         'systemd-networkd',
         'systemd-mount',
         'systemd-timers',