From 950ef1d92f2ec8717f485302dcb67742318045c4 Mon Sep 17 00:00:00 2001
From: Robin Sonnabend <robin@fsmpi.rwth-aachen.de>
Date: Thu, 25 Apr 2019 18:58:54 +0200
Subject: [PATCH] Set MaxFileSec and MaxRetentionSec for journald if configured
---
basic-system/tasks/logging.yml | 2 +-
basic-system/templates/size.conf.j2 | 6 ++++++
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/basic-system/tasks/logging.yml b/basic-system/tasks/logging.yml
index e1480c3..1a3ecd5 100644
--- a/basic-system/tasks/logging.yml
+++ b/basic-system/tasks/logging.yml
@@ -57,7 +57,7 @@
- config
- syslog
-- name: configure journal size limits
+- name: configure journal size and time limits
template:
src: size.conf.j2
dest: /etc/systemd/journald.conf.d/size.conf
diff --git a/basic-system/templates/size.conf.j2 b/basic-system/templates/size.conf.j2
index 9e19100..88273e2 100644
--- a/basic-system/templates/size.conf.j2
+++ b/basic-system/templates/size.conf.j2
@@ -12,4 +12,10 @@ SystemMaxFileSize={{ systemd_journald.system_max_file_size }}
{% if systemd_journald.system_max_files is defined %}
SystemMaxFiles={{ systemd_journald.system_max_files }}
{% endif %}
+{% if systemd_journald.max_file_sec is defined %}
+MaxFileSec={{ systemd_journald.max_file_sec }}
+{% endif %}
+{% if systemd_journald.max_retention_sec is defined %}
+MaxRetentionSec={{ systemd_journald.max_retention_sec }}
+{% endif %}
{% endif %}
--
GitLab