From 95dcb5a8b5de2206a5676c5de992fccd2dddd4fe Mon Sep 17 00:00:00 2001
From: Felix Stupp <felix.stupp@outlook.com>
Date: Tue, 20 Oct 2020 15:17:21 +0200
Subject: [PATCH] common: Configure journald to keep logs persistent until
 storage max

---
 group_vars/all/vars.yml              |  2 ++
 roles/common/handlers/main.yml       |  5 +++++
 roles/common/tasks/journald.yml      | 16 ++++++++++++++++
 roles/common/tasks/main.yml          |  3 +++
 roles/common/templates/journald.conf |  3 +++
 5 files changed, 29 insertions(+)
 create mode 100644 roles/common/tasks/journald.yml
 create mode 100644 roles/common/templates/journald.conf

diff --git a/group_vars/all/vars.yml b/group_vars/all/vars.yml
index ad7dd76..bae0ac4 100644
--- a/group_vars/all/vars.yml
+++ b/group_vars/all/vars.yml
@@ -166,6 +166,8 @@ global_wireguard_ipv4_range: "10.162.4.0/{{ global_wireguard_ipv4_subnet }}"
 
 global_systemd_preset_directory: "/lib/systemd/system"
 global_systemd_configuration_directory: "/etc/systemd/system"
+global_systemd_journal_configuration_directory: "/etc/systmed/journald.conf.d"
+global_systemd_journal_max_storage: 1G
 global_systemd_network_directory: "/etc/systemd/network"
 global_systemd_network_service_name: "systemd-networkd.service"
 global_systemd_network_system_user: "systemd-network"
diff --git a/roles/common/handlers/main.yml b/roles/common/handlers/main.yml
index 81d8bc2..b30f40d 100644
--- a/roles/common/handlers/main.yml
+++ b/roles/common/handlers/main.yml
@@ -1,5 +1,10 @@
 ---
 
+- name: restart systemd-journald
+  service:
+    name: systemd-journald.service
+    state: restarted
+
 - name: generate locales
   command: locale-gen
 
diff --git a/roles/common/tasks/journald.yml b/roles/common/tasks/journald.yml
new file mode 100644
index 0000000..29e9bd5
--- /dev/null
+++ b/roles/common/tasks/journald.yml
@@ -0,0 +1,16 @@
+---
+
+- name: Create directory for journald config
+  file:
+    state: directory
+    path: "{{ global_systemd_journal_configuration_directory }}"
+    owner: root
+    group: root
+    mode: u=rwx,g=rx,o=rx
+
+- name: Configure journald log
+  template:
+    src: journald.conf
+    dest: "{{ global_systemd_journal_configuration_directory }}/main.conf"
+  notify:
+    - restart systemd-journald
diff --git a/roles/common/tasks/main.yml b/roles/common/tasks/main.yml
index 13c79dc..bbec833 100644
--- a/roles/common/tasks/main.yml
+++ b/roles/common/tasks/main.yml
@@ -12,6 +12,9 @@
 - name: Configure locales
   import_tasks: locales.yml
 
+- name: Configure journald
+  import_tasks: journald.yml
+
 - name: Configure custom facts
   import_tasks: custom_facts.yml
 
diff --git a/roles/common/templates/journald.conf b/roles/common/templates/journald.conf
new file mode 100644
index 0000000..715887d
--- /dev/null
+++ b/roles/common/templates/journald.conf
@@ -0,0 +1,3 @@
+[Journal]
+Storage=persistent
+SystemMaxUse={{ global_systemd_journal_max_storage }}