diff --git a/rsyslog.changes b/rsyslog.changes index 9bd9c04..1590dc7 100644 --- a/rsyslog.changes +++ b/rsyslog.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Nov 9 17:08:33 UTC 2020 - Thomas Blume + +- fix location and naming of journald dropin (bsc#1178288) + ------------------------------------------------------------------- Wed Oct 28 07:10:22 UTC 2020 - Thomas Blume diff --git a/rsyslog.spec b/rsyslog.spec index 6dbceb0..3c0c441 100644 --- a/rsyslog.spec +++ b/rsyslog.spec @@ -805,8 +805,8 @@ install -m644 plugins/ompgsql/createDB.sql \ %endif install -d -m0755 %{buildroot}%{_unitdir} install -m644 %{SOURCE3} %{buildroot}%{_unitdir}/ -install -d -m0755 %{buildroot}%{_sysconfdir}/systemd/journald.conf.d -install -m644 %{SOURCE16} %{buildroot}%{_sysconfdir}/systemd/journald.conf.d/rsyslog.conf +install -d -m0755 %{buildroot}%{_prefix}/lib/systemd/journald.conf.d +install -m644 %{SOURCE16} %{buildroot}%{_prefix}/lib/systemd/journald.conf.d/30-rsyslog.conf # create ghosts install -d -m0755 %{buildroot}%{rsyslog_rundir} touch %{buildroot}%{rsyslog_sockets_cfg} @@ -969,8 +969,8 @@ fi # first install %if %{with journal} %{rsyslog_module_dir_nodeps}/imjournal.so %{rsyslog_module_dir_nodeps}/omjournal.so -%dir %{_sysconfdir}/systemd/journald.conf.d/ -%{_sysconfdir}/systemd/journald.conf.d/rsyslog.conf +%dir %{_prefix}/lib/systemd/journald.conf.d/ +%{_prefix}/lib/systemd/journald.conf.d/30-rsyslog.conf %endif %dir %{rsyslog_module_dir_withdeps} %{_mandir}/man5/rsyslog.conf.5*