From 3ecd0e3644f8f3cdb7412f6fe9511570dd244100 Mon Sep 17 00:00:00 2001
From: Christoph <ckubu@oopen.de>
Date: Mon, 13 Jun 2022 17:37:23 +0200
Subject: [PATCH] update..

---
 group_vars/all/main.yml                       | 16 ++++++++++
 hosts                                         |  1 -
 .../journald.conf.d/50-MaxFileSec.conf        |  4 +++
 .../journald.conf.d/50-SystemMaxFileSize.conf |  4 +++
 .../journald.conf.d/50-SystemMaxUse.conf      |  4 +++
 roles/common/handlers/main.yml                |  6 ++++
 roles/common/tasks/basic.yml                  | 30 +++++++++++++++++++
 7 files changed, 64 insertions(+), 1 deletion(-)
 create mode 100644 roles/common/files/etc/systemd/journald.conf.d/50-MaxFileSec.conf
 create mode 100644 roles/common/files/etc/systemd/journald.conf.d/50-SystemMaxFileSize.conf
 create mode 100644 roles/common/files/etc/systemd/journald.conf.d/50-SystemMaxUse.conf

diff --git a/group_vars/all/main.yml b/group_vars/all/main.yml
index 59a518d..8dea323 100644
--- a/group_vars/all/main.yml
+++ b/group_vars/all/main.yml
@@ -74,6 +74,22 @@ copy_plain_files_systemd:
     dest_path: /etc/systemd/system.conf.d/20-DefaultLimitRTTIME.conf
 
 
+#copy_plain_files_journald: []
+copy_plain_files_journald:
+
+   - name: SystemMaxUse
+     src_path: etc/systemd/journald.conf.d/50-SystemMaxUse.conf
+     dest_path: /etc/systemd/journald.conf.d/50-SystemMaxUse.conf
+
+   - name: SystemMaxFileSize
+     src_path: etc/systemd/journald.conf.d/50-SystemMaxFileSize.conf
+     dest_path: /etc/systemd/journald.conf.d/50-SystemMaxFileSize.conf
+
+   - name: MaxFileSec
+     src_path: etc/systemd/journald.conf.d/50-MaxFileSec.conf
+     dest_path: /etc/systemd/journald.conf.d/50-MaxFileSec.conf
+
+
 
 #copy_plain_files_sysctl: []
 copy_plain_files_sysctl:
diff --git a/hosts b/hosts
index 07b562e..0086179 100644
--- a/hosts
+++ b/hosts
@@ -153,7 +153,6 @@ mm-irights.oopen.de
 o25.oopen.de
 cl-fm.oopen.de
 mail.faire-mobilitaet.de
-meet.faire-mobilitaet.de
 
 # Hetzner Cloud CX31 - AK
 o26.oopen.de
diff --git a/roles/common/files/etc/systemd/journald.conf.d/50-MaxFileSec.conf b/roles/common/files/etc/systemd/journald.conf.d/50-MaxFileSec.conf
new file mode 100644
index 0000000..559c4ab
--- /dev/null
+++ b/roles/common/files/etc/systemd/journald.conf.d/50-MaxFileSec.conf
@@ -0,0 +1,4 @@
+# Custom Values overrides '/etc/systemd/journald.conf'
+#
+[Journal]
+MaxFileSec=2day
diff --git a/roles/common/files/etc/systemd/journald.conf.d/50-SystemMaxFileSize.conf b/roles/common/files/etc/systemd/journald.conf.d/50-SystemMaxFileSize.conf
new file mode 100644
index 0000000..1c6b9aa
--- /dev/null
+++ b/roles/common/files/etc/systemd/journald.conf.d/50-SystemMaxFileSize.conf
@@ -0,0 +1,4 @@
+# Custom Values overrides '/etc/systemd/journald.conf'
+#
+[Journal]
+SystemMaxFileSize=10M
diff --git a/roles/common/files/etc/systemd/journald.conf.d/50-SystemMaxUse.conf b/roles/common/files/etc/systemd/journald.conf.d/50-SystemMaxUse.conf
new file mode 100644
index 0000000..1c99ee8
--- /dev/null
+++ b/roles/common/files/etc/systemd/journald.conf.d/50-SystemMaxUse.conf
@@ -0,0 +1,4 @@
+# Custom Values overrides '/etc/systemd/journald.conf'
+#
+[Journal]
+SystemMaxUse=100M
diff --git a/roles/common/handlers/main.yml b/roles/common/handlers/main.yml
index 3c072c8..eeec124 100644
--- a/roles/common/handlers/main.yml
+++ b/roles/common/handlers/main.yml
@@ -48,3 +48,9 @@
   shell: smbcontrol all reload-config
   when:
     - inventory_hostname in groups['samba_server']
+
+- name: Restart systemd-journald
+  service:
+    name: systemd-journald
+    state: restarted
+
diff --git a/roles/common/tasks/basic.yml b/roles/common/tasks/basic.yml
index 18a1787..897d130 100644
--- a/roles/common/tasks/basic.yml
+++ b/roles/common/tasks/basic.yml
@@ -60,6 +60,36 @@
   tags:
     - systemd-config
 
+- name: (basic.yml) Ensure directory '/etc/systemd/journald.conf.d' exists
+  file:
+    path: /etc/systemd/journald.conf.d
+    state: directory
+    mode: 0755
+    group: root
+    owner: root
+  when:
+    - copy_plain_files_journald is defined
+    - copy_plain_files_journald|length > 0
+  tags:
+    - systemd-config
+
+- name: (basic.yml) Ensure files /etc/systemd/journald.conf.d/*.conf exists
+  copy:
+    src: '{{ item.src_path }}'
+    dest: '{{ item.dest_path }}'
+    owner: root
+    group: root
+    mode: '0644'
+  loop: "{{ copy_plain_files_journald }}"
+  loop_control:
+    label: 'dest: {{ item.name }}'
+  notify: "Restart systemd-journald"
+  when:
+    - copy_plain_files_journald is defined
+    - copy_plain_files_journald|length > 0
+  tags:
+    - systemd-config
+
 
 # ----------
 # kernel parameter