From d22011bbbb397f41cc2d87605ed6f0ce4602889a Mon Sep 17 00:00:00 2001
From: Lars Beckers <lars.beckers@rwth-aachen.de>
Date: Fri, 13 Apr 2018 21:28:24 +0200
Subject: [PATCH] basic-system: change conditions on systemd-journal-persistent
---
basic-system/tasks/logging.yml | 23 +++++++++++++----------
1 file changed, 13 insertions(+), 10 deletions(-)
diff --git a/basic-system/tasks/logging.yml b/basic-system/tasks/logging.yml
index bc50880..8d46626 100644
--- a/basic-system/tasks/logging.yml
+++ b/basic-system/tasks/logging.yml
@@ -8,33 +8,36 @@
- sysctl
- config
-- name: ensure rsyslog is absent without broken dependecies
- apt: name=rsyslog state=absent purge=yes dpkg_options="force-confdef,force-confold,force-depends"
- when:
- - ansible_distribution_major_version|int >= 9
- - syslogserver is defined
- - syslogserver.split(":")[0] != ansible_fqdn
- tags:
- - config
- - syslog
-
- name: ensure system journal is a system-log-daemon with our package
apt: name=systemd-journal-persistent state=present
when:
- syslogserver is not defined or syslogserver.split(":")[0] != ansible_fqdn
- ansible_distribution_major_version|int >= 9
+ register: syslog_provider
tags:
- config
- syslog
- name: ensure systemd journal is presistent
file: path=/var/log/journal state=directory
+ when:
+ - ansible_distribution_major_version|int < 9
notify:
- configure journal directory
tags:
- config
- syslog
+- name: ensure rsyslog is absent without broken dependecies
+ apt: name=rsyslog state=absent purge=yes dpkg_options="force-confdef,force-confold,force-depends"
+ when:
+ - not syslog_provider.skipped
+ - ansible_distribution_major_version|int >= 9
+ - syslogserver is not defined or syslogserver.split(":")[0] != ansible_fqdn
+ tags:
+ - config
+ - syslog
+
- name: ensure rsyslog is running and enabled
service: name=rsyslog state=running enabled=yes
when:
--
GitLab