From d6e7e07441980cb5cfeec33e4f9cd8e6114b4f87 Mon Sep 17 00:00:00 2001
From: Hinrikus Wolf <hinrikus@fsmpi.rwth-aachen.de>
Date: Thu, 9 Apr 2020 11:59:18 +0200
Subject: [PATCH] Make systemd journal persistent optional
---
basic-system/defaults/main.yml | 1 +
basic-system/tasks/logging.yml | 5 ++++-
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/basic-system/defaults/main.yml b/basic-system/defaults/main.yml
index 232a4d9..dc51f85 100644
--- a/basic-system/defaults/main.yml
+++ b/basic-system/defaults/main.yml
@@ -6,3 +6,4 @@ hosts_additionals: []
etckeeper: true
rsyslog_needed: false
hosts_precious: false
+journal_persitent_with_package: true
diff --git a/basic-system/tasks/logging.yml b/basic-system/tasks/logging.yml
index 2910dc8..bddf2f3 100644
--- a/basic-system/tasks/logging.yml
+++ b/basic-system/tasks/logging.yml
@@ -19,6 +19,7 @@
- syslogserver is not defined or syslogserver.split(":")[0] != ansible_fqdn
- ansible_distribution_major_version|int >= 9
- not rsyslog_needed
+ - journal_persitent_with_package
register: syslog_provider
tags:
- syslog
@@ -29,7 +30,9 @@
path: /var/log/journal
state: directory
when:
- - ansible_distribution_major_version|int < 9
+ - (ansible_distribution_major_version|int < 9) or
+ (not journal_persitent_with_package)
+ register: syslog_provider
notify:
- configure journal directory
tags:
--
GitLab