Browse code
rsyslog : Add a default rsyslog.conf.
Change-Id: Ib9b359fdd8519e379cf2bbfe5630437595081de4
Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/4285
Tested-by: gerrit-photon <photon-checkins@vmware.com>
Reviewed-by: Anish Swaminathan <anishs@vmware.com>
xiaolin-vmware authored on 2017/11/14 08:30:43Showing 2 changed files
| 1 | 1 |
new file mode 100644 |
| ... | ... |
@@ -0,0 +1,47 @@ |
| 0 |
+# Got the intial file from http://wiki.rsyslog.com/ and modified it |
|
| 1 |
+# if you experience problems, check |
|
| 2 |
+# http://www.rsyslog.com/troubleshoot for assistance |
|
| 3 |
+# |
|
| 4 |
+ |
|
| 5 |
+#### MODULES #### |
|
| 6 |
+ |
|
| 7 |
+module(load="imuxsock") # provides support for local system logging (e.g. via logger command) |
|
| 8 |
+module(load="imklog") # provides kernel logging support (previously done by rklogd) |
|
| 9 |
+module(load="imjournal") # provides access to the systemd journal |
|
| 10 |
+#module(load="immark") # provides --MARK-- message capability |
|
| 11 |
+ |
|
| 12 |
+# Provides UDP syslog reception |
|
| 13 |
+#module(load="imudp") |
|
| 14 |
+#input(type="imudp" port="514") |
|
| 15 |
+ |
|
| 16 |
+# Provides TCP syslog reception |
|
| 17 |
+#module(load="imtcp") |
|
| 18 |
+#input(type="imtcp" port="514") |
|
| 19 |
+ |
|
| 20 |
+#### GLOBAL DIRECTIVES #### |
|
| 21 |
+ |
|
| 22 |
+$umask 0000 |
|
| 23 |
+ |
|
| 24 |
+#### REMOTE RULES #### |
|
| 25 |
+ |
|
| 26 |
+#### LOCAL RULES #### |
|
| 27 |
+ |
|
| 28 |
+# Log all kernel messages to the console. |
|
| 29 |
+#kern.* /dev/console |
|
| 30 |
+ |
|
| 31 |
+# The authpriv file has restricted access. |
|
| 32 |
+authpriv.* /var/log/messages |
|
| 33 |
+ |
|
| 34 |
+# Log all the mail messages in one place. |
|
| 35 |
+mail.* /var/log/maillog" |
|
| 36 |
+# Log cron stuff |
|
| 37 |
+cron.* /var/log/cron |
|
| 38 |
+ |
|
| 39 |
+# Everybody gets emergency messages |
|
| 40 |
+*.emerg :omusrmsg:* |
|
| 41 |
+ |
|
| 42 |
+# Save news errors of level crit and higher in a special file. |
|
| 43 |
+uucp,news.crit /var/log/spooler |
|
| 44 |
+ |
|
| 45 |
+# Save boot messages also to boot.log |
|
| 46 |
+local7.* /var/log/boot.log |
| ... | ... |
@@ -1,17 +1,18 @@ |
| 1 |
-Summary: Rocket-fast system for log processing |
|
| 2 |
-Name: rsyslog |
|
| 3 |
-Version: 8.26.0 |
|
| 4 |
-Release: 2%{?dist}
|
|
| 5 |
-License: GPLv3+ and ASL 2.0 |
|
| 6 |
-URL: http://www.rsyslog.com/ |
|
| 7 |
-Source0: http://www.rsyslog.com/files/download/rsyslog/%{name}-%{version}.tar.gz
|
|
| 8 |
-%define sha1 rsyslog=9c5e253fbf1c6992ac5d1eefe17587d4da2cdbfd |
|
| 1 |
+Summary: Rocket-fast system for log processing |
|
| 2 |
+Name: rsyslog |
|
| 3 |
+Version: 8.26.0 |
|
| 4 |
+Release: 3%{?dist}
|
|
| 5 |
+License: GPLv3+ and ASL 2.0 |
|
| 6 |
+URL: http://www.rsyslog.com/ |
|
| 7 |
+Source0: http://www.rsyslog.com/files/download/rsyslog/%{name}-%{version}.tar.gz
|
|
| 8 |
+%define sha1 rsyslog=9c5e253fbf1c6992ac5d1eefe17587d4da2cdbfd |
|
| 9 | 9 |
Source1: rsyslog.service |
| 10 | 10 |
Source2: 50-rsyslog-journald.conf |
| 11 |
+Source3: rsyslog.conf |
|
| 11 | 12 |
#Patch taken from https://github.com/rsyslog/rsyslog/pull/1565 |
| 12 |
-Patch0: CVE-2017-12588.patch |
|
| 13 |
-Group: System Environment/Base |
|
| 14 |
-Vendor: VMware, Inc. |
|
| 13 |
+Patch0: CVE-2017-12588.patch |
|
| 14 |
+Group: System Environment/Base |
|
| 15 |
+Vendor: VMware, Inc. |
|
| 15 | 16 |
Distribution: Photon |
| 16 | 17 |
BuildRequires: systemd-devel |
| 17 | 18 |
BuildRequires: libestr-devel |
| ... | ... |
@@ -22,12 +23,12 @@ BuildRequires: librelp-devel |
| 22 | 22 |
BuildRequires: autogen |
| 23 | 23 |
BuildRequires: gnutls-devel |
| 24 | 24 |
Requires: gnutls |
| 25 |
-Requires: systemd |
|
| 26 |
-Requires: libestr |
|
| 27 |
-Requires: libfastjson |
|
| 28 |
-Requires: libgcrypt |
|
| 29 |
-Requires: liblogging |
|
| 30 |
-Requires: librelp |
|
| 25 |
+Requires: systemd |
|
| 26 |
+Requires: libestr |
|
| 27 |
+Requires: libfastjson |
|
| 28 |
+Requires: libgcrypt |
|
| 29 |
+Requires: liblogging |
|
| 30 |
+Requires: librelp |
|
| 31 | 31 |
%description |
| 32 | 32 |
RSYSLOG is the rocket-fast system for log processing. |
| 33 | 33 |
It offers high-performance, great security features and a modular design. While it started as a regular syslogd, rsyslog has evolved into a kind of swiss army knife of logging, being able to accept inputs from a wide variety of sources, transform them, and output to the results to diverse destinations. |
| ... | ... |
@@ -38,8 +39,8 @@ It offers high-performance, great security features and a modular design. While |
| 38 | 38 |
sed -i 's/libsystemd-journal/libsystemd/' configure |
| 39 | 39 |
./configure \ |
| 40 | 40 |
--prefix=%{_prefix} \
|
| 41 |
- --enable-relp \ |
|
| 42 |
- --enable-gnutls\ |
|
| 41 |
+ --enable-relp \ |
|
| 42 |
+ --enable-gnutls\ |
|
| 43 | 43 |
--enable-imfile \ |
| 44 | 44 |
--enable-imjournal \ |
| 45 | 45 |
--enable-impstats \ |
| ... | ... |
@@ -53,6 +54,7 @@ install -vd %{buildroot}%{_sysconfdir}/systemd/journald.conf.d/
|
| 53 | 53 |
rm -f %{buildroot}/lib/systemd/system/rsyslog.service
|
| 54 | 54 |
install -p -m 644 %{SOURCE1} %{buildroot}%{_libdir}/systemd/system/
|
| 55 | 55 |
install -p -m 644 %{SOURCE2} %{buildroot}%{_sysconfdir}/systemd/journald.conf.d/
|
| 56 |
+install -p -m 644 %{SOURCE3} %{buildroot}%{_sysconfdir}/rsyslog.conf
|
|
| 56 | 57 |
find %{buildroot} -name '*.la' -delete
|
| 57 | 58 |
|
| 58 | 59 |
%check |
| ... | ... |
@@ -77,25 +79,28 @@ make %{?_smp_mflags} check
|
| 77 | 77 |
%{_mandir}/man8/*
|
| 78 | 78 |
%{_libdir}/systemd/system/rsyslog.service
|
| 79 | 79 |
%{_sysconfdir}/systemd/journald.conf.d/*
|
| 80 |
+%{_sysconfdir}/rsyslog.conf
|
|
| 80 | 81 |
%changelog |
| 81 |
-* Tue Aug 15 2017 Dheeraj Shetty <dheerajs@vmware.com> 8.26.0-2 |
|
| 82 |
-- Fix CVE-2017-12588 |
|
| 83 |
-* Mon Apr 24 2017 Siju Maliakkal <smaliakkal@vmware.com> 8.26.0-1 |
|
| 84 |
-- Update to latest |
|
| 85 |
-* Fri Nov 18 2016 Anish Swaminathan <anishs@vmware.com> 8.15.0-7 |
|
| 86 |
-- Change systemd dependency |
|
| 87 |
-* Wed Oct 05 2016 ChangLee <changlee@vmware.com> 8.15.0-6 |
|
| 88 |
-- Modified %check |
|
| 89 |
-* Thu May 26 2016 Divya Thaluru <dthaluru@vmware.com> 8.15.0-5 |
|
| 90 |
-- Fixed logic to restart the active services after upgrade |
|
| 91 |
-* Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 8.15.0-4 |
|
| 92 |
-- GA - Bump release of all rpms |
|
| 93 |
-* Wed May 4 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 8.15.0-3 |
|
| 94 |
-- Use systemd macros for post, preun and postun to respect upgrades |
|
| 95 |
-* Wed Feb 17 2016 Anish Swaminathan <anishs@vmware.com> 8.15.0-2 |
|
| 96 |
-- Add journald conf and new service file. |
|
| 97 |
-* Mon Jan 11 2016 Xiaolin Li <xiaolinl@vmware.com> 8.15.0-1 |
|
| 98 |
-- Update rsyslog to 8.15.0 |
|
| 99 |
-* Wed Jun 17 2015 Divya Thaluru <dthaluru@vmware.com> 8.10.0-1 |
|
| 100 |
-- Initial build. First version |
|
| 82 |
+* Mon Nov 13 2017 Xiaolin Li <xiaolinl@vmware.com> 8.26.0-3 |
|
| 83 |
+- Add a default rsyslog.conf. |
|
| 84 |
+* Tue Aug 15 2017 Dheeraj Shetty <dheerajs@vmware.com> 8.26.0-2 |
|
| 85 |
+- Fix CVE-2017-12588 |
|
| 86 |
+* Mon Apr 24 2017 Siju Maliakkal <smaliakkal@vmware.com> 8.26.0-1 |
|
| 87 |
+- Update to latest |
|
| 88 |
+* Fri Nov 18 2016 Anish Swaminathan <anishs@vmware.com> 8.15.0-7 |
|
| 89 |
+- Change systemd dependency |
|
| 90 |
+* Wed Oct 05 2016 ChangLee <changlee@vmware.com> 8.15.0-6 |
|
| 91 |
+- Modified %check |
|
| 92 |
+* Thu May 26 2016 Divya Thaluru <dthaluru@vmware.com> 8.15.0-5 |
|
| 93 |
+- Fixed logic to restart the active services after upgrade |
|
| 94 |
+* Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 8.15.0-4 |
|
| 95 |
+- GA - Bump release of all rpms |
|
| 96 |
+* Wed May 4 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 8.15.0-3 |
|
| 97 |
+- Use systemd macros for post, preun and postun to respect upgrades |
|
| 98 |
+* Wed Feb 17 2016 Anish Swaminathan <anishs@vmware.com> 8.15.0-2 |
|
| 99 |
+- Add journald conf and new service file. |
|
| 100 |
+* Mon Jan 11 2016 Xiaolin Li <xiaolinl@vmware.com> 8.15.0-1 |
|
| 101 |
+- Update rsyslog to 8.15.0 |
|
| 102 |
+* Wed Jun 17 2015 Divya Thaluru <dthaluru@vmware.com> 8.10.0-1 |
|
| 103 |
+- Initial build. First version |
|
| 101 | 104 |
|