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