rsyslog.conf: first load default modules, then third-party config

Resolves: rhbz#1985202

.gitignore

@@ -73,3 +73,7 @@ rsyslog-4.6.3.tar.gz
 /rsyslog-doc-8.2001.0.tar.gz
 /rsyslog-8.2002.0.tar.gz
 /rsyslog-doc-8.2002.0.tar.gz
+/rsyslog-8.2008.0.tar.gz
+/rsyslog-doc-8.2008.0.tar.gz
+/rsyslog-8.2010.0.tar.gz
+/rsyslog-doc-8.2010.0.tar.gz

rsyslog-8.34.0-sd-service.patch

@@ -1,14 +0,0 @@
-diff -up rsyslog-7.4.1/rsyslog.service.in.orig rsyslog-7.4.1/rsyslog.service.in
---- rsyslog-7.4.1/rsyslog.service.in.orig	2013-06-17 15:28:54.430023493 +0200
-+++ rsyslog-7.4.1/rsyslog.service.in	2013-06-17 15:30:05.874378084 +0200
-@@ -6,7 +6,9 @@ Requires=syslog.socket
- 
- [Service]
- Type=notify
--ExecStart=@sbindir@/rsyslogd -n -iNONE
-+EnvironmentFile=-/etc/sysconfig/rsyslog
-+ExecStart=@sbindir@/rsyslogd -n $SYSLOGD_OPTIONS
-+UMask=0066
- StandardOutput=null
- Restart=on-failure
- 

rsyslog.conf

@@ -9,19 +9,20 @@
 # Where to place auxiliary files
 global(workDirectory="/var/lib/rsyslog")
 
+#### MODULES ####
+
 # Use default timestamp format
 module(load="builtin:omfile" Template="RSYSLOG_TraditionalFileFormat")
 
+module(load="imuxsock"    # provides support for local system logging (e.g. via logger command)
+       SysSock.Use="off") # Turn off message reception via local log socket; 
+                          # local messages are retrieved through imjournal now.
+module(load="imjournal"             # provides access to the systemd journal
+       StateFile="imjournal.state") # File to store the position in the journal
+
 # Include all config files in /etc/rsyslog.d/
 include(file="/etc/rsyslog.d/*.conf" mode="optional")
 
-#### MODULES ####
-
-module(load="imuxsock" 	  # provides support for local system logging (e.g. via logger command)
-       SysSock.Use="off") # Turn off message reception via local log socket; 
-			  # local messages are retrieved through imjournal now.
-module(load="imjournal" 	    # provides access to the systemd journal
-       StateFile="imjournal.state") # File to store the position in the journal
 #module(load="imklog") # reads kernel messages (the same are read from journald)
 #module(load="immark") # provides --MARK-- message capability
 

rsyslog.service

@@ -0,0 +1,22 @@
+[Unit]
+Description=System Logging Service
+;Requires=syslog.socket
+Documentation=man:rsyslogd(8)
+Documentation=https://www.rsyslog.com/doc/
+
+[Service]
+Type=notify
+EnvironmentFile=-/etc/sysconfig/rsyslog
+ExecStart=/usr/sbin/rsyslogd -n $SYSLOGD_OPTIONS
+ExecReload=/usr/bin/kill -HUP $MAINPID
+UMask=0066
+StandardOutput=null
+Restart=on-failure
+
+# Increase the default a bit in order to allow many simultaneous
+# files to be monitored, we might need a lot of fds.
+LimitNOFILE=16384
+
+[Install]
+WantedBy=multi-user.target
+;Alias=syslog.service

rsyslog.spec

@@ -8,8 +8,8 @@
 
 Summary: Enhanced system logging and kernel message trapping daemon
 Name: rsyslog
-Version: 8.2002.0
-Release: 5%{?dist}
+Version: 8.2010.0
+Release: 2%{?dist}
 License: (GPLv3+ and ASL 2.0)
 URL: http://www.rsyslog.com/
 Source0: http://www.rsyslog.com/files/download/rsyslog/%{name}-%{version}.tar.gz
@@ -17,6 +17,7 @@ Source1: http://www.rsyslog.com/files/download/rsyslog/%{name}-doc-%{version}.ta
 Source2: rsyslog.conf
 Source3: rsyslog.sysconfig
 Source4: rsyslog.log
+Source5: rsyslog.service
 
 BuildRequires: gcc
 BuildRequires: autoconf
@@ -43,10 +44,6 @@ Requires: bash >= 2.0
 Provides: syslog
 Obsoletes: sysklogd < 1.5-11
 
-# tweak the upstream service file to honour configuration from /etc/sysconfig/rsyslog
-Patch0: rsyslog-8.34.0-sd-service.patch
-Patch1: service-exec-reload.patch
-
 %package crypto
 Summary: Encryption support
 Requires: %name = %version-%release
@@ -246,8 +243,6 @@ rm -r LICENSE README.md source build/objects.inv
 mv build doc
 # set up rsyslog sources
 %setup -q -D
-%patch0 -p1
-%patch1 -p1
 
 autoreconf -iv
 
@@ -322,6 +317,7 @@ make V=1 DESTDIR=%{buildroot} install
 
 install -d -m 755 %{buildroot}%{_sysconfdir}/sysconfig
 install -d -m 755 %{buildroot}%{_sysconfdir}/logrotate.d
+install -d -m 755 %{buildroot}%{_unitdir}
 install -d -m 755 %{buildroot}%{_sysconfdir}/rsyslog.d
 install -d -m 700 %{buildroot}%{rsyslog_statedir}
 install -d -m 700 %{buildroot}%{rsyslog_pkidir}
@@ -330,6 +326,7 @@ install -d -m 755 %{buildroot}%{rsyslog_docdir}/html
 install -p -m 644 %{SOURCE2} %{buildroot}%{_sysconfdir}/rsyslog.conf
 install -p -m 644 %{SOURCE3} %{buildroot}%{_sysconfdir}/sysconfig/rsyslog
 install -p -m 644 %{SOURCE4} %{buildroot}%{_sysconfdir}/logrotate.d/rsyslog
+install -p -m 644 %{SOURCE5} %{buildroot}%{_unitdir}/rsyslog.service
 install -p -m 644 plugins/ommysql/createDB.sql %{buildroot}%{rsyslog_docdir}/mysql-createDB.sql
 install -p -m 644 plugins/ompgsql/createDB.sql %{buildroot}%{rsyslog_docdir}/pgsql-createDB.sql
 dos2unix tools/recover_qi.pl
@@ -339,8 +336,6 @@ install -p -m 644 contrib/mmkubernetes/*.rulebase %{buildroot}%{rsyslog_docdir}
 cp -r doc/* %{buildroot}%{rsyslog_docdir}/html
 # get rid of libtool libraries
 rm -f %{buildroot}%{_libdir}/rsyslog/*.la
-# get rid of socket activation by default
-sed -i '/^Alias/s/^/;/;/^Requires=syslog.socket/s/^/;/' %{buildroot}%{_unitdir}/rsyslog.service
 # imdiag and liboverride is only used for testing
 rm -f %{buildroot}%{_libdir}/rsyslog/imdiag.so
 rm -f %{buildroot}%{_libdir}/rsyslog/liboverride_gethostname.so
@@ -489,6 +484,23 @@ done
 %doc %{rsyslog_docdir}/k8s_container_name.rulebase
 
 %changelog
+* Tue Jul 27 2021 Pavel Raiskup <praiskup@redhat.com> - 8.2102.0-2
+- reorder the rsyslog.conf to simplify the rsyslog.d configuration (#1985202)
+
+* Wed Nov 25 2020 Attila Lakatos <alakatos@redhat.com> - 8.2010.0-1
+- rebase to upstream version 8.2010.0
+  resolves: rhbz#1890330
+
+* Fri Sep 18 2020 Attila Lakatos <alakatos@redhat.com> - 8.2008.0-2
+- rebuild rsyslog
+
+* Thu Sep 17 2020 Attila Lakatos <alakatos@redhat.com> - 8.2008.0-1
+- rebase to upstream version 8.2008.0
+  resolves: rhbz#1829092
+  resolves: rhbz#1823862
+  resolves: rhbz#1876773
+- add service file back(upstream does not ship it anymore)
+
 * Thu Aug 27 2020 Josef Řídký <jridky@redhat.com> - 8.2002.0-5
 - Rebuilt for new net-snmp release
 

service-exec-reload.patch

@@ -1,11 +0,0 @@
-diff -up rsyslog-8.2002.0/rsyslog.service.in.orig rsyslog-8.2002.0/rsyslog.service.in
---- rsyslog-8.2002.0/rsyslog.service.in.orig	2020-08-20 14:23:22.358994995 +0200
-+++ rsyslog-8.2002.0/rsyslog.service.in	2020-08-20 14:23:48.345178883 +0200
-@@ -8,6 +8,7 @@ Documentation=https://www.rsyslog.com/do
- Type=notify
- EnvironmentFile=-/etc/sysconfig/rsyslog
- ExecStart=@sbindir@/rsyslogd -n $SYSLOGD_OPTIONS
-+ExecReload=/usr/bin/kill -HUP $MAINPID
- UMask=0066
- StandardOutput=null
- Restart=on-failure

sources

@@ -1,2 +1,2 @@
-SHA512 (rsyslog-8.2002.0.tar.gz) = a01bb2f67d21ab6d96dd1302bc351b509892834ef44956983db912a63ba23201653ca1e6b176a574c47568665b4d92579bb8bb0fe6911646bc841a3754c2754f
-SHA512 (rsyslog-doc-8.2002.0.tar.gz) = 5d6bd8fe09b49644f000416c87c8600cd3df3facb07845afd85012279df203a44b234e94a7be90ad83709d5f2ad1a2bf8cb51571c5c0cd76383f76f81455945e
+SHA512 (rsyslog-8.2010.0.tar.gz) = e3c8ed6b631053e38abfe8ce183a1544d04a0207dc988d36f5141a7ea8c987915f4c0429ccd094b7e374c277b7ee5b50e65e7205c156af01ffe9bdf8338831c8
+SHA512 (rsyslog-doc-8.2010.0.tar.gz) = 072fb05a0117dc0970a4e5e302abbaf5dc065c2a0962c4160e7efb86fedad89a2caa546cd2bf4af07b7f5e2fa5267cf02889d911f7a6916725e6aea1760ab253