Accepting request 641065 from home:kukuk:branches:Base:System

- Enable ForwardToSyslog for journald to get syslog messages 
  [bsc#1110456]

OBS-URL: https://build.opensuse.org/request/show/641065
OBS-URL: https://build.opensuse.org/package/show/Base:System/rsyslog?expand=0&rev=299

journald-rsyslog.conf

@@ -0,0 +1,2 @@
+[Journal]
+ForwardToSyslog=yes

rsyslog.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Oct 10 16:16:55 CEST 2018 - kukuk@suse.de
+
+- Enable ForwardToSyslog for journald to get syslog messages 
+  [bsc#1110456]
+
 -------------------------------------------------------------------
 Tue Sep 18 17:34:53 UTC 2018 - Michael Ströder <michael@stroeder.com>
 

rsyslog.spec

@@ -12,7 +12,7 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
 #
 
 
@@ -231,6 +231,7 @@ Source8:        module-snmp
 Source9:        module-udpspoof
 Source14:       http://www.rsyslog.com/files/download/rsyslog/rsyslog-doc-%{version}.tar.gz
 Source15:       rsyslog.firewall
+Source16:       journald-rsyslog.conf
 
 # PATCH-FIX-OPENSUSE rsyslog-unit.patch crrodriguez@opensuse.org Customize upstream systemd unit for openSUSE needs.
 Patch0:         rsyslog-unit.patch
@@ -812,6 +813,10 @@ install -m644 plugins/ommysql/createDB.sql \
 install -m644 plugins/ompgsql/createDB.sql \
 	%{buildroot}%{rsyslogdocdir}/pgsql-createDB.sql
 %endif
+%if %{with systemd}
+install -d -m0755 %{buildroot}%{_sysconfdir}/systemd/journald.conf.d
+install %{SOURCE16} %{buildroot}%{_sysconfdir}/systemd/journald.conf.d/rsyslog.conf
+%endif
 # create ghosts
 install -d -m0755 %{buildroot}%{rsyslog_rundir}
 touch %{buildroot}%{rsyslog_sockets_cfg}
@@ -1019,6 +1024,8 @@ fi
 %if %{with systemd} && %{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
 %endif
 %dir %{rsyslog_module_dir_withdeps}
 %{_mandir}/man5/rsyslog.conf.5*