From 09e932080c1c3a9254f5b81c15d553321e6df878 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Sun, 24 Nov 2024 14:55:13 -0800 Subject: [PATCH] rkhunter: adjust for f41+ journald.conf default On Fedora 41 /etc/systemd/journald.conf isn't shipped by default anymore. Instead /usr/lib/systemd/journalc.conf is the default On RHEL and older Fedora's we can just not set this and it will find the default one. Signed-off-by: Kevin Fenzi --- roles/rkhunter/templates/rkhunter.conf.j2 | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/roles/rkhunter/templates/rkhunter.conf.j2 b/roles/rkhunter/templates/rkhunter.conf.j2 index 117f287016..f25eaec4c9 100644 --- a/roles/rkhunter/templates/rkhunter.conf.j2 +++ b/roles/rkhunter/templates/rkhunter.conf.j2 @@ -507,6 +507,13 @@ PASSWORD_FILE=/etc/shadow # usually need to be set. # #SYSLOG_CONFIG_FILE=/etc/syslog.conf +{% if ansible_distribution_major_version|int >= 40 %} +# On Fedora 41 /etc/systemd/journald.conf isn't shipped by default anymore. +# Instead /usr/lib/systemd/journalc.conf is the default +# Oh RHEL and older Fedora's we can just not set this and it will +# find the default one. +SYSLOG_CONFIG_FILE="/etc/rsyslog.conf /usr/lib/systemd/journald.conf" +{% endif %} # # This option permits the use of syslog remote logging.