rebase to 8.34.0
finished converting rsyslog config to new syntax dropped obsolete defattr statements from spec
This commit is contained in:
Jiri Vymazal
parent
c485a3e6f3
commit
b05cdc6e76
10
rsyslog.conf
10
rsyslog.conf
@ -33,7 +33,7 @@ global(workDirectory="/var/lib/rsyslog")
|
||||
module(load="builtin:omfile" Template="RSYSLOG_TraditionalFileFormat")
|
||||
|
||||
# Include all config files in /etc/rsyslog.d/
|
||||
$IncludeConfig /etc/rsyslog.d/*.conf
|
||||
include(file="/etc/rsyslog.d/*.conf" mode="optional")
|
||||
|
||||
#### RULES ####
|
||||
|
||||
@ -67,13 +67,13 @@ local7.* /var/log/boot.log
|
||||
|
||||
# ### sample forwarding rule ###
|
||||
#action(type="omfwd"
|
||||
# An on-disk queue is created for this action. If the remote host is
|
||||
# down, messages are spooled to disk and sent when it is up again.
|
||||
# # An on-disk queue is created for this action. If the remote host is
|
||||
# # down, messages are spooled to disk and sent when it is up again.
|
||||
#queue.filename="fwdRule1" # unique name prefix for spool files
|
||||
#queue.maxdiskspace="1g" # 1gb space limit (use as much as possible)
|
||||
#queue.saveonshutdown="on" # save messages to disk on shutdown
|
||||
#queue.type="LinkedList" # run asynchronously
|
||||
#action.resumeRetryCount="-1" # infinite retries if host is down
|
||||
# Remote Logging (we use TCP for reliable delivery)
|
||||
# remote_host is: name/ip, e.g. 192.168.0.1, port optional e.g. 10514
|
||||
# # Remote Logging (we use TCP for reliable delivery)
|
||||
# # remote_host is: name/ip, e.g. 192.168.0.1, port optional e.g. 10514
|
||||
#Target="remote_host" Port="XXX" Protocol="tcp")
|
||||
|
||||
30
rsyslog.spec
30
rsyslog.spec
@ -15,8 +15,8 @@
|
||||
|
||||
Summary: Enhanced system logging and kernel message trapping daemon
|
||||
Name: rsyslog
|
||||
Version: 8.32.0
|
||||
Release: 2%{?dist}
|
||||
Version: 8.34.0
|
||||
Release: 1%{?dist}
|
||||
License: (GPLv3+ and ASL 2.0)
|
||||
Group: System Environment/Daemons
|
||||
URL: http://www.rsyslog.com/
|
||||
@ -388,7 +388,6 @@ done
|
||||
%systemd_postun_with_restart rsyslog.service
|
||||
|
||||
%files
|
||||
%defattr(-,root,root,-)
|
||||
%{!?_licensedir:%global license %%doc}
|
||||
%license COPYING*
|
||||
%doc AUTHORS ChangeLog README.md
|
||||
@ -440,98 +439,83 @@ done
|
||||
%{_libdir}/rsyslog/pmsnare.so
|
||||
|
||||
%files crypto
|
||||
%defattr(-,root,root)
|
||||
%{_bindir}/rscryutil
|
||||
%{_mandir}/man1/rscryutil.1.gz
|
||||
%{_libdir}/rsyslog/lmcry_gcry.so
|
||||
|
||||
%files doc
|
||||
%defattr(-,root,root)
|
||||
%doc %{rsyslog_docdir}/html
|
||||
|
||||
%files elasticsearch
|
||||
%defattr(-,root,root)
|
||||
%{_libdir}/rsyslog/omelasticsearch.so
|
||||
|
||||
%if %{want_hiredis}
|
||||
%files hiredis
|
||||
%defattr(-,root,root)
|
||||
%{_libdir}/rsyslog/omhiredis.so
|
||||
%endif
|
||||
|
||||
%files libdbi
|
||||
%defattr(-,root,root)
|
||||
%{_libdir}/rsyslog/omlibdbi.so
|
||||
|
||||
%files mmaudit
|
||||
%defattr(-,root,root)
|
||||
%{_libdir}/rsyslog/mmaudit.so
|
||||
|
||||
%files mmjsonparse
|
||||
%defattr(-,root,root)
|
||||
%{_libdir}/rsyslog/mmjsonparse.so
|
||||
|
||||
%files mmnormalize
|
||||
%defattr(-,root,root)
|
||||
%{_libdir}/rsyslog/mmnormalize.so
|
||||
|
||||
%files mmsnmptrapd
|
||||
%defattr(-,root,root)
|
||||
%{_libdir}/rsyslog/mmsnmptrapd.so
|
||||
|
||||
%files mysql
|
||||
%defattr(-,root,root)
|
||||
%doc %{rsyslog_docdir}/mysql-createDB.sql
|
||||
%{_libdir}/rsyslog/ommysql.so
|
||||
|
||||
%if %{want_mongodb}
|
||||
%files mongodb
|
||||
%defattr(-,root,root)
|
||||
%{_bindir}/logctl
|
||||
%{_libdir}/rsyslog/ommongodb.so
|
||||
%endif
|
||||
|
||||
%files pgsql
|
||||
%defattr(-,root,root)
|
||||
%doc %{rsyslog_docdir}/pgsql-createDB.sql
|
||||
%{_libdir}/rsyslog/ompgsql.so
|
||||
|
||||
%files rabbitmq
|
||||
%defattr(-,root,root)
|
||||
%{_libdir}/rsyslog/omrabbitmq.so
|
||||
|
||||
%files gssapi
|
||||
%defattr(-,root,root)
|
||||
%{_libdir}/rsyslog/lmgssutil.so
|
||||
%{_libdir}/rsyslog/imgssapi.so
|
||||
%{_libdir}/rsyslog/omgssapi.so
|
||||
|
||||
%files relp
|
||||
%defattr(-,root,root)
|
||||
%{_libdir}/rsyslog/imrelp.so
|
||||
%{_libdir}/rsyslog/omrelp.so
|
||||
|
||||
%files gnutls
|
||||
%defattr(-,root,root)
|
||||
%{_libdir}/rsyslog/lmnsd_gtls.so
|
||||
|
||||
%files snmp
|
||||
%defattr(-,root,root)
|
||||
%{_libdir}/rsyslog/omsnmp.so
|
||||
|
||||
%files udpspoof
|
||||
%defattr(-,root,root)
|
||||
%{_libdir}/rsyslog/omudpspoof.so
|
||||
|
||||
%files omamqp1
|
||||
%defattr(-,root,root)
|
||||
%{_libdir}/rsyslog/omamqp1.so
|
||||
|
||||
%files kafka
|
||||
%defattr(-,root,root)
|
||||
%{_libdir}/rsyslog/omkafka.so
|
||||
|
||||
%changelog
|
||||
* Thu Apr 05 2018 Jiri Vymazal <jvymazal@redhat.com> - 8.34.0-1
|
||||
- rebase to 8.34.0
|
||||
- finished converting rsyslog config to new syntax
|
||||
- dropped obsolete defattr statements from spec
|
||||
|
||||
* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 8.32.0-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user