.gear/rules | 3 + .../tags/38973670292d8c52a218b73bea8f66cec80d59f1 | 23 + .gear/tags/list | 1 + .gear/upstream/remotes | 3 + 00_common.conf | 29 + 01_mongo.conf | 12 + 01_mysql.conf | 8 + 02_pgsql.conf | 6 + 03_gssapi.conf | 3 + 04_relp.conf | 6 + 05_dbi.conf | 3 + 06_snmp.conf | 3 + 07_udpspoof.conf | 7 + 08_journal.conf | 18 + 10_classic.conf | 2 + platform/redhat/centos/rsyslog.service | 7 +- plugins/imgssapi/Makefile.am | 2 +- plugins/omgssapi/Makefile.am | 2 +- plugins/ommysql/createDB.sql | 6 +- plugins/ompgsql/createDB.sql | 2 - rsyslog-systemd.prestart | 12 + rsyslog.classic.conf.d | 12 + rsyslog.conf.alt | 1 + rsyslog.spec | 975 +++++++++++++++++++++ rsyslogd.alt | 5 + rsyslogd.init | 130 +++ syslog.conf | 77 ++ 27 files changed, 1346 insertions(+), 12 deletions(-) diff --git a/.gear/rules b/.gear/rules new file mode 100644 index 000000000..ea8524739 --- /dev/null +++ b/.gear/rules @@ -0,0 +1,3 @@ +tar: v@version@:. +diff: v@version@:. . name=@name@-@version@.patch + diff --git a/.gear/tags/38973670292d8c52a218b73bea8f66cec80d59f1 b/.gear/tags/38973670292d8c52a218b73bea8f66cec80d59f1 new file mode 100644 index 000000000..e461f0f84 --- /dev/null +++ b/.gear/tags/38973670292d8c52a218b73bea8f66cec80d59f1 @@ -0,0 +1,23 @@ +object 63fed99bccb7bef93d5d386674f0471c26cd9173 +type commit +tag v8.2304.0 +tagger Rainer Gerhards 1681729522 +0200 + +v8.2304.0 +-----BEGIN PGP SIGNATURE----- + +iQJKBAABCgA0FiEEKKjDsLhvL2h0OhJODLayqL6AtJkFAmQ9J/YWHHJnZXJoYXJk +c0BhZGlzY29uLmNvbQAKCRAMtrKovoC0mU48D/0WMQ68kGDryXa7Ym4apelnXwsX +jPKiJVlF/zcBRVz1mg6R2s/dauncDvrT+YqOLgS1plSPdlwLAZdMPXApXzd8ixqt +VhN6jvnfYJwyHU/yMUIPtA4K+w3iT3Gx18F3FLwlzGA8/oj0R1HwWm8rvpdi/cHk +jpWsI4kRtNh1ijxCG8M9XNoJynjIqXVzwuMNxeMBufrXEq2cTLlODm/qXyD0YNH7 +RH2uTIi2zr+O005xQkCxptldEFTcclkeyHkDVHQFypkGFxaiXyQT+Msey2q/dr4D +/GqoCx9ac11rsDpsw1NiYJQO1znLozkSLh5SPXQkdwwQy50xpvGqlLcVi2L7ox+R +RbhfnHRx5tJMyzFM7rR6XFu1GbZm9KTLSjqryYfbp/DkSQ3GgJQ9LsGoYJmhuWyz +15LIhP6WnLTC47JIPvHraqnxc8REVD+BITuD45asaT9ohKmu4GxQU6wpSG7JHPy3 +ICCmaLC4HL29X6SDp+NMBAnrAPyvSCwmSMhWDNEJkXS6NtpC1FRex4JCvnzJTlVk +PWp+2SBiEfkJ9aymOZomMbJxqZ25gtSvZ7zEb6BwZ1vu0KjXEfgg4FRyeW+JqQPx +O+PENgkQ5bXqPUFYEWSZhej/kach2VKnW4zec+1iFEiwrdOT+jXx0KeCRn7bnUxE +FxhtTreQ6Eou+DkZkg== +=GMhX +-----END PGP SIGNATURE----- diff --git a/.gear/tags/list b/.gear/tags/list new file mode 100644 index 000000000..5d3de43c5 --- /dev/null +++ b/.gear/tags/list @@ -0,0 +1 @@ +38973670292d8c52a218b73bea8f66cec80d59f1 v8.2304.0 diff --git a/.gear/upstream/remotes b/.gear/upstream/remotes new file mode 100644 index 000000000..53b2d5b4e --- /dev/null +++ b/.gear/upstream/remotes @@ -0,0 +1,3 @@ +[remote "upstream"] + url = https://github.com/rsyslog/rsyslog.git + fetch = +refs/heads/*:refs/remotes/upstream/* diff --git a/00_common.conf b/00_common.conf new file mode 100644 index 000000000..c4d676258 --- /dev/null +++ b/00_common.conf @@ -0,0 +1,29 @@ +#### MODULES #### + +#module(load="imjournal") # provides support for systemd-journald logging +#module(load="imuxsock") # provides support for local system logging (e.g. via logger command) +#module(load="imklog") # provides kernel logging support (previously done by rklogd) +#module(load="immark") # provides --MARK-- message capability + +# Provides UDP syslog reception +# for parameters see http://www.rsyslog.com/doc/imudp.html +#module(load="imudp") # needs to be done just once +#input(type="imudp" port="514") + +# Provides TCP syslog reception +# for parameters see http://www.rsyslog.com/doc/imtcp.html +#module(load="imtcp") # needs to be done just once +#input(type="imtcp" port="514") + +#### GLOBAL DIRECTIVES #### + +# Use default timestamp format +module(load="builtin:omfile" Template="RSYSLOG_TraditionalFileFormat" + DirCreateMode="0755" + FileCreateMode="0640" + fileOwner="root" + fileGroup="adm") + +# An "In-Memory Queue" is created for remote logging. +global(workDirectory="/var/spool/rsyslog") # where to place spool files + diff --git a/01_mongo.conf b/01_mongo.conf new file mode 100644 index 000000000..273f34897 --- /dev/null +++ b/01_mongo.conf @@ -0,0 +1,12 @@ +template(name="BSON" type="string" string="\\"sys\\" : \\"%hostname%\\", +\\"time\\" : \\"%timereported:::rfc3339%\\", \\"time\_rcvd\\" : +\\"%timegenerated:::rfc3339%\\", \\"msg\\" : \\"%msg%\\", +\\"syslog\_fac\\" : \\"%syslogfacility%\\", \\"syslog\_server\\" : +\\"%syslogseverity%\\", \\"syslog\_tag\\" : \\"%syslogtag%\\", +\\"procid\\" : \\"%programname%\\", \\"pid\\" : \\"%procid%\\", +\\"level\\" : \\"%syslogpriority-text%\\"") + +module(load="ommongodb") +#action(type="ommongodb" +# server="mongoserver.example.com" db="syslog" collection="log" +# uid="user" pwd="pwd") diff --git a/01_mysql.conf b/01_mysql.conf new file mode 100644 index 000000000..dbc45418b --- /dev/null +++ b/01_mysql.conf @@ -0,0 +1,8 @@ +$template tpl,"insert into SystemEvents (Message, Facility, FromHost, +Priority, DeviceReportedTime, ReceivedAt, InfoUnitID, SysLogTag) values +('%msg%', %syslogfacility%, '%HOSTNAME%', %syslogpriority%, +'%timereported:::date-mysql%', '%timegenerated:::date-mysql%', %iut%, +'%syslogtag%')",SQL + +module(load="ommysql") +#action(type="ommysql" server="mysqlserver.example.com" serverport="1234" db="syslog_db" uid="user" pwd="pwd") diff --git a/02_pgsql.conf b/02_pgsql.conf new file mode 100644 index 000000000..52821dd88 --- /dev/null +++ b/02_pgsql.conf @@ -0,0 +1,6 @@ +module(load="ompgsql") + +#action(type="ompgsql" server="pgsqlserver.example.com" serverport="1234" db="syslog_db" uid="user" pwd="pwd") + + + diff --git a/03_gssapi.conf b/03_gssapi.conf new file mode 100644 index 000000000..0dd38f962 --- /dev/null +++ b/03_gssapi.conf @@ -0,0 +1,3 @@ +module(load="lmgssutil") +module(load="imgssapi") +module(load="omgssapi") diff --git a/04_relp.conf b/04_relp.conf new file mode 100644 index 000000000..56fa37e32 --- /dev/null +++ b/04_relp.conf @@ -0,0 +1,6 @@ + +module(load="imrelp") # needs to be done just once +#input(type="imrelp" port="20514" maxDataSize="10k") + +module(load="omrelp") +#action(type="omrelp" target="centralserv" port="2514") diff --git a/05_dbi.conf b/05_dbi.conf new file mode 100644 index 000000000..bb879c8a8 --- /dev/null +++ b/05_dbi.conf @@ -0,0 +1,3 @@ +module(load="omlibdbi") + +#action(type="omlibdbi" driver="mysql" server="mysqlserver.example.com" db="syslog_db" uid="user" pwd="pwd") diff --git a/06_snmp.conf b/06_snmp.conf new file mode 100644 index 000000000..6ac0135e4 --- /dev/null +++ b/06_snmp.conf @@ -0,0 +1,3 @@ +module(load="omsnmp") + +#action(type="omsnmp" transport="udp" target="localhost" targetport="162" version="1" community="public") diff --git a/07_udpspoof.conf b/07_udpspoof.conf new file mode 100644 index 000000000..c33a2ac52 --- /dev/null +++ b/07_udpspoof.conf @@ -0,0 +1,7 @@ +module(load="omudpspoof") + +#action(type="omudpspoof" target="server.example.com") + +#template(name="spoofaddr" type="string" string="192.0.2.1") +#template(name="spooftemplate" type="string" string="%rawmsg%") +#action(type="omudpspoof" target="server.example.com" sourcetemplate="spoofaddr" template="spooftemplate" sourceport.start="514" sourceport.end="514) diff --git a/08_journal.conf b/08_journal.conf new file mode 100644 index 000000000..91cdb7c3a --- /dev/null +++ b/08_journal.conf @@ -0,0 +1,18 @@ +module(load="imjournal" StateFile="imjournal.state") + +#module(load="mmjsonparse") #load mmjsonparse module for structured logs + +#template(name="CEETemplate" type="string" +# string="%TIMESTAMP% %HOSTNAME% %syslogtag% @cee: %$!all-json%\n" +#) #template for messages + +#action(type="mmjsonparse") +#action(type="omfile" file="/var/log/ceelog" template="CEETemplate") + +#module(load="omjournal") # output module for journal +#template(name="journal" type="list") { +# constant(value="Something happened" outname="MESSAGE") +# property(name="$!event-type" outname="EVENT_TYPE") +#} + +#action(type="omjournal" template="journal") \ No newline at end of file diff --git a/10_classic.conf b/10_classic.conf new file mode 100644 index 000000000..3fb1554e9 --- /dev/null +++ b/10_classic.conf @@ -0,0 +1,2 @@ +module(load="imuxsock") # provides support for local system logging (e.g. via logger command) +include(file="/etc/syslog.conf" mode="optional") \ No newline at end of file diff --git a/platform/redhat/centos/rsyslog.service b/platform/redhat/centos/rsyslog.service index 30a133910..9e795b7d6 100644 --- a/platform/redhat/centos/rsyslog.service +++ b/platform/redhat/centos/rsyslog.service @@ -1,6 +1,5 @@ [Unit] Description=System Logging Service -;Requires=syslog.socket Wants=network.target network-online.target After=network.target network-online.target Documentation=man:rsyslogd(8) @@ -8,8 +7,9 @@ Documentation=https://www.rsyslog.com/doc/ [Service] Type=notify -EnvironmentFile=-/etc/sysconfig/rsyslog -ExecStart=/usr/sbin/rsyslogd -n $SYSLOGD_OPTIONS +EnvironmentFile=-/etc/sysconfig/rsyslogd +ExecStart=/sbin/rsyslogd -n $RSYSLOGD_OPTIONS +ExecReload=/bin/kill -HUP $MAINPID Restart=on-failure UMask=0066 StandardOutput=null @@ -20,4 +20,3 @@ LimitNOFILE=16384 [Install] WantedBy=multi-user.target -;Alias=syslog.service diff --git a/plugins/imgssapi/Makefile.am b/plugins/imgssapi/Makefile.am index ea0163531..0a98ca3b2 100644 --- a/plugins/imgssapi/Makefile.am +++ b/plugins/imgssapi/Makefile.am @@ -1,6 +1,6 @@ pkglib_LTLIBRARIES = imgssapi.la imgssapi_la_SOURCES = imgssapi.c -imgssapi_la_CPPFLAGS = -I$(top_srcdir) $(PTHREADS_CFLAGS) $(RSRT_CFLAGS) +imgssapi_la_CPPFLAGS = -I$(top_srcdir) $(PTHREADS_CFLAGS) $(RSRT_CFLAGS) $(GSS_CFLAGS) imgssapi_la_LDFLAGS = -module -avoid-version imgssapi_la_LIBADD = $(GSS_LIBS) diff --git a/plugins/omgssapi/Makefile.am b/plugins/omgssapi/Makefile.am index a57a64b34..7bebdbe18 100644 --- a/plugins/omgssapi/Makefile.am +++ b/plugins/omgssapi/Makefile.am @@ -1,6 +1,6 @@ pkglib_LTLIBRARIES = omgssapi.la omgssapi_la_SOURCES = omgssapi.c -omgssapi_la_CPPFLAGS = -I$(top_srcdir) $(PTHREADS_CFLAGS) $(RSRT_CFLAGS) +omgssapi_la_CPPFLAGS = -I$(top_srcdir) $(PTHREADS_CFLAGS) $(RSRT_CFLAGS) $(GSS_CFLAGS) omgssapi_la_LDFLAGS = -module -avoid-version omgssapi_la_LIBADD = $(GSS_LIBS) diff --git a/plugins/ommysql/createDB.sql b/plugins/ommysql/createDB.sql index 211cfb0e2..1dc6f5c37 100644 --- a/plugins/ommysql/createDB.sql +++ b/plugins/ommysql/createDB.sql @@ -1,6 +1,4 @@ -CREATE DATABASE Syslog; -USE Syslog; -CREATE TABLE SystemEvents +CREATE TABLE IF NOT EXISTS SystemEvents ( ID int unsigned not null auto_increment primary key, CustomerID bigint, @@ -28,7 +26,7 @@ CREATE TABLE SystemEvents SystemID int NULL ); -CREATE TABLE SystemEventsProperties +CREATE TABLE IF NOT EXISTS SystemEventsProperties ( ID int unsigned not null auto_increment primary key, SystemEventID int NULL , diff --git a/plugins/ompgsql/createDB.sql b/plugins/ompgsql/createDB.sql index 0c0f7e13a..5dab0ddaa 100644 --- a/plugins/ompgsql/createDB.sql +++ b/plugins/ompgsql/createDB.sql @@ -1,5 +1,3 @@ -CREATE DATABASE "Syslog" WITH ENCODING 'SQL_ASCII' TEMPLATE template0; -\c Syslog; CREATE TABLE SystemEvents ( ID serial not null primary key, diff --git a/rsyslog-systemd.prestart b/rsyslog-systemd.prestart new file mode 100755 index 000000000..430e6c20b --- /dev/null +++ b/rsyslog-systemd.prestart @@ -0,0 +1,12 @@ +#!/bin/sh + +CONF="/etc/rsyslog.d/20_extrasockets.conf" +STRING="Generating list of extra sockets in /etc/syslog.d/" +echo -n "$STRING " +echo '# Do not edit manually. This file is autogenerated.' > $CONF +echo >> $CONF + +for LOGSOCK in $(ls -1 /etc/syslog.d/); do + echo '$AddUnixListenSocket ' $(readlink /etc/syslog.d/$LOGSOCK) >> $CONF +done +echo diff --git a/rsyslog.classic.conf.d b/rsyslog.classic.conf.d new file mode 100644 index 000000000..3d3414fad --- /dev/null +++ b/rsyslog.classic.conf.d @@ -0,0 +1,12 @@ +[Unit] +Wants= +After= +Requires=syslog.socket + +[Service] +ExecStartPre=/lib/systemd/altlinux-rsyslog-extrasockets +ExecStartPost=/bin/touch /var/lock/subsys/rsyslogd +ExecStopPost=/bin/rm -f /var/lock/subsys/rsyslogd + +[Install] +Alias=syslog.service diff --git a/rsyslog.conf.alt b/rsyslog.conf.alt new file mode 100644 index 000000000..ea3d146a0 --- /dev/null +++ b/rsyslog.conf.alt @@ -0,0 +1 @@ +include(file="/etc/rsyslog.d/*.conf" mode="optional") diff --git a/rsyslog.spec b/rsyslog.spec new file mode 100644 index 000000000..f229d4280 --- /dev/null +++ b/rsyslog.spec @@ -0,0 +1,975 @@ +# vim: set ft=spec: -*- rpm-spec -*- + +%define _unpackaged_files_terminate_build 1 + +%def_enable gssapi +%def_disable liblogging_stdlog +%def_disable rfc3195 +%def_enable mmcount +%def_disable ksi_ls12 +%def_disable omamqp1 +%def_enable omhiredis +%def_enable imhiredis +%def_enable ommongodb +%def_enable omhttp +%def_disable imhttp +%def_enable omhttpfs +%def_enable elasticsearch +%def_enable openssl +%def_enable gnutls +%def_enable libgcrypt +%def_enable libsystemd +%def_enable mmkubernetes +%def_enable clickhouse +%def_enable imdocker +%def_enable impcap +%def_enable libzstd +%def_enable libcap_ng + +Name: rsyslog +Version: 8.2304.0 +Release: alt1 + +Summary: Enhanced system logging and kernel message trapping daemon +License: Apache-2.0 AND GPL-3.0-or-later +Group: System/Kernel and hardware +Url: http://www.rsyslog.com +# https://github.com/rsyslog/rsyslog.git +Source: %name-%version.tar +Patch: %name-%version.patch + +BuildRequires: flex +BuildRequires: zlib-devel +BuildRequires: libdbi-devel +BuildRequires: libmysqlclient-devel +BuildRequires: postgresql-devel +BuildRequires: libkrb5-devel +BuildRequires: librelp-devel >= 1.2.16 +%{?_enable_gnutls:BuildRequires: libgnutls-devel >= 1.4.0} +%{?_enable_libgcrypt:BuildRequires: libgcrypt-devel} +%{?_enable_openssl:BuildRequires: libssl-devel} +BuildRequires: libnet-snmp-devel +BuildRequires: libnet-devel +BuildRequires: libestr-devel >= 0.1.9 +BuildRequires: libfastjson-devel >= 0.99.8 +BuildRequires: libuuid-devel +%{?_enable_liblogging_stdlog:BuildRequires: liblogging-devel >= 1.0.3} +%{?_enable_rfc3195:BuildRequires: liblogging-devel >= 1.0.1} +%{?_enable_ksi_ls12:BuildRequires: libksi-devel >= 3.19.0} +%{?_enable_omamqp1:BuildRequires: libqpid-proton-devel >= 0.9} +BuildRequires: liblognorm-devel >= 2.0.3 +%{?_enable_ommongodb:BuildRequires: libmongoc-devel} +%{?_enable_elasticsearch:BuildRequires: libcurl-devel} +%{?_enable_omhttpfs:BuildRequires: libcurl-devel >= 7.0.0} +%{?_enable_omhttp:BuildRequires: libcurl-devel} +%{?_enable_imhttp:BuildRequires: libcivetweb-devel libaprutil1-devel >= 1.0} +%{?_enable_omhiredis:BuildRequires: libhiredis-devel >= 0.10.1} +%{?_enable_imhiredis:BuildRequires: libhiredis-devel >= 0.10.1 libevent-devel >= 2.0} +%{?_enable_libsystemd:BuildRequires: libsystemd-devel >= 209} +%{?_enable_mmkubernetes:BuildRequires: libcurl-devel} +%{?_enable_clickhouse:BuildRequires: libcurl-devel} +%{?_enable_imdocker:BuildRequires: libcurl-devel >= 7.40.0} +%{?_enable_impcap:BuildRequires: libpcap-devel} +%{?_enable_libzstd:BuildRequires: libzstd-devel >= 1.4.0} +%{?_enable_libcap_ng:BuildRequires: libcap-ng-devel >= 0.8.2} + +BuildRequires: iproute2 +BuildRequires: /usr/bin/rst2man +BuildRequires: /usr/bin/lsb_release + +%define mod_dir /%_lib/%name + +%description +Rsyslog is an enhanced multi-threaded syslogd supporting, among others, MySQL, +PostgreSQL, syslog/tcp, RFC 3195, permitted sender lists, filtering on any +message part, and fine grain output format control. It is quite compatible to +stock sysklogd and can be used as a drop-in replacement. Its advanced features +make it suitable for enterprise-class, encryption protected syslog relay chains +while at the same time being very easy to setup for the novice user. + + o lmnet.so - Implementation of network related stuff. + o lmregexp.so - Implementation of regexp related stuff. + o lmtcpclt.so - This is the implementation of TCP-based syslog clients. + o lmtcpsrv.so - Common code for plain TCP based servers. + o imtcp.so - This is the implementation of the TCP input module. + o imudp.so - This is the implementation of the UDP input module. + o imuxsock.so - This is the implementation of the Unix sockets input module. + o imklog.so - The kernel log input module for Linux. + o imkmsg.so - /dev/kmsg Log Input Module + o immark.so - This is the implementation of the build-in mark message input + module. + o imfile.so - This is the input module for reading text file data. + +%package classic +Summary: Classic configuration +Group: System/Kernel and hardware +BuildArch: noarch +Requires: %name = %version-%release +Provides: syslogd-daemon +Provides: /etc/rsyslog.d +Requires: syslog-common +Conflicts: syslogd klogd +Conflicts: syslog-ng + +%description classic +This package containes a classic syslog configuration with logging to /var/log. + +%package crypto +Summary: Encryption support +Group: System/Kernel and hardware +Requires: %name = %version-%release + +%description crypto +This package containes a module providing log file encryption and a +command line tool to process encrypted logs. + +%package journal +Summary: Systemd journal support for rsyslog +Group: System/Kernel and hardware +Requires: %name = %version-%release + +%description journal +The rsyslog-journal package contains a dynamic shared object that will add +systemd journal support to rsyslog. + + o imjournal.so - This is the implementation of the systemd journal input module. + o omjournal.so - This is the implementation of the systemd journal output module. + +%package mysql +Summary: MySQL support for rsyslog +Group: System/Kernel and hardware +Requires: %name = %version-%release + +%description mysql +The rsyslog-mysql package contains a dynamic shared object that will add +MySQL database support to rsyslog. + + o ommysql.so - This is the implementation of the build-in output module for + MySQL. + +%package pgsql +Summary: PostgreSQL support for rsyslog +Group: System/Kernel and hardware +Requires: %name = %version-%release + +%description pgsql +The rsyslog-pgsql package contains a dynamic shared object that will add +PostgreSQL database support to rsyslog. + + o ompgsql.so - This is the implementation of the build-in output module for + PgSQL. + +%package mongo +Summary: MongoDB support for rsyslog +Group: System/Kernel and hardware +Requires: %name = %version-%release + +%description mongo +The rsyslog-mongo package contains a dynamic shared object that will add +mongo database support to rsyslog. + + o ommongodb.so - This is the implementation of the build-in output module for + MongoDB. + +%package gssapi +Summary: GSS-API support for rsyslog +Group: System/Kernel and hardware +Requires: %name = %version-%release + +%description gssapi +The rsyslog-gssapi package contains dynamic shared objects that will add +GSS-API support to rsyslog. + + o lmgssutil.so - This is a miscellaneous helper class for gss-api features. + o imgssapi.so - This is the implementation of the GSSAPI input module. + o omgssapi.so - This is the implementation of the build-in forwarding output + module. + +%package gnutls +Summary: GNUTLS support for rsyslog +Group: System/Kernel and hardware +Requires: %name = %version-%release + +%description gnutls +The rsyslog-gnutls package contains dynamic shared objects that will add +GNUTLS support to rsyslog. + + o lmnsd_gtls.so - This is a miscellaneous helper class for gnutls features. + +%package openssl +Summary: Openssl support for rsyslog +Group: System/Kernel and hardware +Requires: %name = %version-%release + +%description openssl +The rsyslog-openssl package contains dynamic shared objects that will add +openssl support to rsyslog. + + o lmnsd_ossl.so - This is a miscellaneous helper class for openssl features. + +%package relp +Summary: RELP support for rsyslog +Group: System/Kernel and hardware +Requires: %name = %version-%release + +%description relp +The rsyslog-relp package contains a dynamic shared object that will add +RELP support to rsyslog. + + o imrelp.so - This is the implementation of the RELP input module. + o omrelp.so - This is the implementation of the RELP output module. + +%package dbi +Summary: Dbi support for rsyslog +Group: System/Kernel and hardware +Requires: %name = %version-%release + +%description dbi +The rsyslog-dbi package contains a dynamic shared object that will add +dbi driver support to rsyslog. + + o omlibdbi.so - This is the implementation of the dbi output module. + +%package snmp +Summary: SNMP support for rsyslog +Group: System/Kernel and hardware +Requires: %name = %version-%release + +%description snmp +The rsyslog-snmp package contains a dynamic shared object that will add +SNMP support to rsyslog. + + o omsnmp.so - This module sends an snmp trap. + +%package udpspoof +Summary: UDP forwarder with spoof the sender address for rsyslog +Group: System/Kernel and hardware +Requires: %name = %version-%release + +%description udpspoof +The rsyslog-udpspoof package contains a dynamic shared object that will add +UDP forwarder, but permits to spoof the sender address. + + o omudpspoof.so - This module permits to spoof the sender address. + +%package mmaudit +Summary: Message modification module supporting Linux audit format +Group: System/Kernel and hardware +Requires: %name = %version-%release + +%description mmaudit +The rsyslog-mmaudit package contains a dynamic shared object that will add +message modification supporting Linux audit format in various settings. + + o mmaudit.so - This module provides message modification supporting Linux audit format. + +%package mmcount +Summary: Message counting support for rsyslog +Group: System/Kernel and hardware +Requires: %name = %version-%release + +%description mmcount +This module provides the capability to count log messages by severity +or json property of given app-name. The count value is added into the +log message in json property named 'mmcount' + +%package mmjsonparse +Summary: JSON enhanced logging support +Group: System/Kernel and hardware +Requires: %name = %version-%release + +%description mmjsonparse +The rsyslog-mmjsonparse package contains a dynamic shared object that will add +capability to recognize and parse JSON enhanced syslog messages. + + o mmjsonparse.so - This module provides the capability to recognize and parse JSON enhanced +syslog messages. + +%package mmnormalize +Summary: Log normalization support for rsyslog +Group: System/Kernel and hardware +Requires: %name = %version-%release + +%description mmnormalize +The rsyslog-mmnormalize package contains a dynamic shared object that will add +normalize log messages via liblognorm. + + o mmnormalize.so - This module provides the capability to normalize log messages via liblognorm. + o pmnormalize.so - Parser module that uses liblognorm to parse incoming messages. + +%package mmanon +Summary: mmanon output module for rsyslog +Group: System/Kernel and hardware +Requires: %name = %version-%release + +%description mmanon +IP Address Anonimization Module (mmanon). +It is a message modification module that actually changes the IP address +inside the message, so after calling mmanon, the original message can +no longer be obtained. Note that anonymization will break digital +signatures on the message, if they exist. + + +%package elasticsearch +Summary: ElasticSearch output module for rsyslog +Group: System/Kernel and hardware +Requires: %name = %version-%release + +%description elasticsearch +The rsyslog-elasticsearch package contains a dynamic shared object that will add +feed logs directly into Elasticsearch. + + o omelasticsearch.so - This module provides the capability for rsyslog to feed logs directly into +Elasticsearch. + +%package clickhouse +Summary: clickhouse output module for rsyslog +Group: System/Kernel and hardware +Requires: %name = %version-%release + +%description clickhouse +The rsyslog-clickhouse package contains a dynamic shared object that will add +feed logs directly into clickhouse. + + o clickhouse.so - This is the https://clickhouse.yandex/ output module. + +%package hiredis +Summary: Redis support for rsyslog +Group: System/Kernel and hardware +Requires: %name = %version-%release + +%description hiredis +The rsyslog-hiredis package contains a dynamic shared object that will add +feed logs directly into hiredis. + + o omhiredis.so - This module provides output to Redis. + o imhiredis.so - This module provides input from Redis. + +%package mmkubernetes +Summary: Provides the mmkubernetes module +Group: System/Kernel and hardware +Requires: %name = %version-%release + +%description mmkubernetes +The rsyslog-mmkubernetes package provides module for adding kubernetes +container metadata. + +%package extra +Summary: Extra support for rsyslog +Group: System/Kernel and hardware +Requires: %name = %version-%release + +%description extra +The rsyslog-extra package contains a dynamic shared object that will add +all other functions: + + o imptcp.so - This is a native implementation of plain tcp input module with epool. + o omprog.so - This output plugin enables rsyslog to execute a program and + feed it the message stream as standard input. + o omuxsock.so - This is the implementation of datgram unix domain socket forwarding. + o pmaixforwardedfrom.so - This detects logs sent by AIX. + o pmcisconames.so - This detects logs sent by Cisco devices. + o pmciscoios.so - Parser supporting various Cisco IOS formats + o pmlastmsg.so - This is a parser module specifically for those horrible + "last message repeated n times" messages notoriously + generated by some syslog implementations. + o pmsnare.so - This detects logs sent by Snare. + o pmpanngfw - Module to detect and transform PAN-OS NGFW logs into a format compatible with mmnormalize + o mmsnmptrapd.so - This is a message modification module. It takes messages generated + from snmptrapd and modifies them so that the look like they + originated from the real originator. + o imdiag.so - The testing module, which enables to talk to the rsyslog core at runtime + o impstats.so - Input Module to Generate Periodic Statistics of Internal Counters + o omstdout.so - stdout output module (stdout) + o mmexternal.so - external message modification modules + o fmhttp.so + + +%prep +%setup -q +%patch -p1 + +%build +%autoreconf +# the hiredis-devel package doesn't provide a pkg-config file +export HIREDIS_CFLAGS=-I/usr/include/hiredis +export HIREDIS_LIBS=-lhiredis +%configure \ + --sbindir=/sbin \ + --libdir=/%_lib \ + --disable-static \ + --disable-testbench \ + %{subst_enable elasticsearch} \ + %{subst_enable mmcount} \ + %{subst_enable libgcrypt} \ + %{subst_enable openssl} \ + %{subst_enable gnutls} \ + %{?_enable_gssapi:--enable-gssapi-krb5} \ + %{subst_enable libzstd} \ + --enable-imdiag \ + --enable-imbatchreport \ + --enable-imfile \ + %{subst_enable imdocker} \ + --enable-imtuxedoulog \ + --enable-improg \ + --enable-imjournal \ + --enable-impstats \ + %{subst_enable impcap} \ + --enable-imptcp \ + --enable-inet \ + --enable-klog \ + --enable-kmsg \ + --enable-largefile \ + --enable-libdbi \ + %{?_enable_ksi_ls12:--enable-ksi-ls12} \ + %{?_enable_liblogging_stdlog:--enable-liblogging-stdlog} \ + %{subst_enable rfc3195} \ + --enable-mail \ + --enable-mmanon \ + --enable-mmaudit \ + --enable-mmjsonparse \ + --enable-mmnormalize \ + --enable-mmsnmptrapd \ + --enable-mmrm1stspace \ + --enable-mmutf8fix \ + --enable-mmsequence \ + --enable-mmfields \ + --enable-mmkubernetes \ + --enable-mmtaghostname \ + --enable-mysql \ + %{subst_enable omhttp} \ + %{subst_enable omhttpfs} \ + %{subst_enable omamqp1} \ + %{subst_enable omhiredis} \ + %{subst_enable imhiredis} \ + --enable-omjournal \ + %{subst_enable ommongodb} \ + --enable-omprog \ + --enable-omruleset \ + --enable-omstdout \ + --enable-omudpspoof \ + --enable-omuxsock \ + --enable-pgsql \ + --enable-pmaixforwardedfrom \ + --enable-pmcisconames \ + --enable-pmciscoios \ + --enable-pmnull \ + --enable-pmnormalize \ + --enable-pmlastmsg \ + --enable-pmsnare \ + --enable-pmpanngfw \ + --enable-regexp \ + --enable-relp \ + --enable-snmp \ + --enable-unlimited-select \ + --enable-usertools \ + --enable-generate-man-pages \ + %{subst_enable mmkubernetes} \ + %{subst_enable clickhouse} \ + %{subst_enable libsystemd} \ + %{?_enable_libcap_ng:--enable-libcap-ng} \ + --with-systemdsystemunitdir=%_unitdir + +%make_build + +%install +%makeinstall_std +rm -f %buildroot%mod_dir/*.la + +mkdir -p %buildroot{%_sysconfdir/{sysconfig,%name.d},%_initdir,%_unitdir,%_var/spool/%name} + +install -m640 rsyslog.conf.alt %buildroot%_sysconfdir/%name.conf +install -m640 rsyslogd.alt %buildroot%_sysconfdir/sysconfig/rsyslogd +install -m755 rsyslogd.init %buildroot%_initdir/rsyslogd +install -m640 *_*.conf %buildroot%_sysconfdir/rsyslog.d/ +install -m640 syslog.conf %buildroot%_sysconfdir/syslog.conf +install -m644 platform/redhat/centos/rsyslog.service %buildroot%_unitdir/rsyslog.service +install -m755 rsyslog-systemd.prestart %buildroot%_unitdir/../altlinux-rsyslog-extrasockets +touch %buildroot%_sysconfdir/rsyslog.d/20_extrasockets.conf + +# add aliase rsyslogd to rsyslog for systemd +ln -s rsyslog.service %buildroot%_unitdir/rsyslogd.service +# add default start for systemd +mkdir -p %buildroot%_unitdir/syslog.target.wants +ln -s ../rsyslog.service %buildroot%_unitdir/syslog.target.wants/rsyslog.service +mkdir -p %buildroot%_unitdir/rsyslog.service.d +install -m644 rsyslog.classic.conf.d %buildroot%_unitdir/rsyslog.service.d/classic.conf + +%post +%post_service rsyslogd + +%preun +%preun_service rsyslogd + +%files +%doc AUTHORS ChangeLog README +%config(noreplace) %attr(640,root,adm) %_sysconfdir/%name.conf +%dir %_sysconfdir/%name.d/ +%dir %_var/spool/%name +%config(noreplace) %attr(640,root,adm) %_sysconfdir/rsyslog.d/*_common.conf +%config(noreplace) %_sysconfdir/sysconfig/rsyslogd +%config %_initdir/rsyslogd +%dir %_unitdir/rsyslog.service.d +%_unitdir/*.service +%_unitdir/syslog.target.wants/rsyslog.service +%dir %mod_dir +%mod_dir/imfile.so +%mod_dir/imklog.so +%mod_dir/imkmsg.so +%mod_dir/immark.so +%mod_dir/imtcp.so +%if_enabled rfc3195 +%mod_dir/im3195.so +%endif +%mod_dir/imudp.so +%mod_dir/imuxsock.so +%mod_dir/lmnet.so +%mod_dir/lmnetstrms.so +%mod_dir/lmnsd_ptcp.so +%mod_dir/lmregexp.so +%mod_dir/lmtcpclt.so +%mod_dir/lmzlibw.so +%if_enabled libzstd +%mod_dir/lmzstdw.so +%endif +%mod_dir/lmtcpsrv.so +%mod_dir/ommail.so +%mod_dir/omruleset.so + +/sbin/rsyslogd +%_mandir/man?/rsyslog* + +%files classic +%config(noreplace) %attr(640,root,adm) %_sysconfdir/rsyslog.d/*_classic.conf +%config(noreplace) %attr(640,root,adm) %_sysconfdir/syslog.conf +%config(noreplace) %verify(not md5 size mtime) %attr(640,root,adm) %ghost %_sysconfdir/rsyslog.d/20_extrasockets.conf +%_unitdir/../altlinux-rsyslog-extrasockets +%_unitdir/rsyslog.service.d/classic.conf + +%files crypto +%_bindir/rscryutil +%mod_dir/lmcry_gcry.so +%_man1dir/rscryutil.* + +%files journal +%config(noreplace) %attr(640,root,adm) %_sysconfdir/rsyslog.d/*_journal.conf +%mod_dir/imjournal.so +%mod_dir/omjournal.so + +%files mysql +%doc plugins/ommysql/createDB.sql +%config(noreplace) %attr(640,root,adm) %_sysconfdir/rsyslog.d/*_mysql.conf +%mod_dir/ommysql.so + +%files pgsql +%doc plugins/ompgsql/createDB.sql +%config(noreplace) %attr(640,root,adm) %_sysconfdir/rsyslog.d/*_pgsql.conf +%mod_dir/ompgsql.so + +%if_enabled ommongodb +%files mongo +%_bindir/logctl +%config(noreplace) %attr(640,root,adm) %_sysconfdir/rsyslog.d/*_mongo.conf +%mod_dir/ommongodb.so +%endif + +%if_enabled gssapi +%files gssapi +%config(noreplace) %attr(640,root,adm) %_sysconfdir/rsyslog.d/*_gssapi.conf +%mod_dir/omgssapi.so +%mod_dir/imgssapi.so +%mod_dir/lmgssutil.so +%endif + +%if_enabled gnutls +%files gnutls +%mod_dir/lmnsd_gtls.so +%endif + +%if_enabled openssl +%files openssl +%mod_dir/lmnsd_ossl.so +%endif + +%files relp +%config(noreplace) %attr(640,root,adm) %_sysconfdir/rsyslog.d/*_relp.conf +%mod_dir/imrelp.so +%mod_dir/omrelp.so + +%files dbi +%config(noreplace) %attr(640,root,adm) %_sysconfdir/rsyslog.d/*_dbi.conf +%mod_dir/omlibdbi.so + +%files snmp +%config(noreplace) %attr(640,root,adm) %_sysconfdir/rsyslog.d/*_snmp.conf +%mod_dir/omsnmp.so + +%files udpspoof +%config(noreplace) %attr(640,root,adm) %_sysconfdir/rsyslog.d/*_udpspoof.conf +%mod_dir/omudpspoof.so + +%files mmaudit +%mod_dir/mmaudit.so + +%if_enabled mmcount +%files mmcount +%mod_dir/mmcount.so +%endif + +%files mmjsonparse +%mod_dir/mmjsonparse.so + +%files mmnormalize +%mod_dir/mmnormalize.so +%mod_dir/pmnormalize.so + +%files mmanon +%mod_dir/mmanon.so + +%if_enabled mmkubernetes +%files mmkubernetes +%mod_dir/mmkubernetes.so +%endif + +%if_enabled elasticsearch +%files elasticsearch +%mod_dir/omelasticsearch.so +%endif + +%if_enabled clickhouse +%files clickhouse +%mod_dir/omclickhouse.so +%endif + +%if_enabled omhiredis +%files hiredis +%mod_dir/omhiredis.so +%mod_dir/imhiredis.so +%endif + +%files extra +%mod_dir/fmhash.so +%mod_dir/imbatchreport.so +%mod_dir/imdiag.so +%if_enabled impcap +%mod_dir/impcap.so +%endif +%if_enabled imdocker +%mod_dir/imdocker.so +%endif +%mod_dir/imptcp.so +%mod_dir/improg.so +%mod_dir/impstats.so +%mod_dir/imtuxedoulog.so +%if_enabled omhttp +%mod_dir/omhttp.so +%endif +%if_enabled omhttpfs +%mod_dir/omhttpfs.so +%endif +%mod_dir/omprog.so +%mod_dir/omtesting.so +%mod_dir/omstdout.so +%mod_dir/omuxsock.so +%mod_dir/pmaixforwardedfrom.so +%mod_dir/pmcisconames.so +%mod_dir/pmciscoios.so +%mod_dir/pmnull.so +%mod_dir/pmlastmsg.so +%mod_dir/pmsnare.so +%mod_dir/pmpanngfw.so +%mod_dir/mmfields.so +%mod_dir/mmrm1stspace.so +%mod_dir/mmexternal.so +%mod_dir/mmsequence.so +%mod_dir/mmsnmptrapd.so +%mod_dir/mmtaghostname.so +%mod_dir/mmutf8fix.so +%mod_dir/fmhttp.so + +%changelog +* Mon Apr 24 2023 Alexey Shabalin 8.2304.0-alt1 +- New version 8.2304.0. +- build with libcap-ng support. + +* Tue Jan 10 2023 Alexey Shabalin 8.2212.0-alt1 +- new version 8.2212.0 + +* Tue Oct 25 2022 Alexey Shabalin 8.2210.0-alt1 +- new version 8.2210.0 + +* Thu Oct 06 2022 Alexey Shabalin 8.2208.0-alt1 +- new version 8.2208.0 +- build with libzstd support + +* Thu Jul 28 2022 Alexey Shabalin 8.2206.0-alt1 +- new version 8.2206.0 + +* Mon Jun 06 2022 Alexey Shabalin 8.2204.1-alt1 +- 8.2204.1 (Fixes: CVE-2022-24903) + +* Tue Mar 22 2022 Alexey Shabalin 8.2202.0-alt1 +- new version 8.2202.0 +- renamed 00_classic.conf to 10_classic.conf +- renamed 00_extrasockets.conf to 20_extrasockets.conf (ALT#37239) + +* Fri Oct 29 2021 Alexey Shabalin 8.2110.0-alt1 +- new version 8.2110.0 + +* Fri Sep 03 2021 Alexey Shabalin 8.2108.0-alt2 +- Fixed configs. + +* Tue Aug 17 2021 Alexey Shabalin 8.2108.0-alt1 +- new version 8.2108.0 + +* Wed Jun 30 2021 Alexey Shabalin 8.2106.0-alt1 +- new version 8.2106.0 + +* Sun Mar 14 2021 Alexey Shabalin 8.2102.0-alt1 +- new version 8.2102.0 + +* Tue Dec 15 2020 Alexey Shabalin 8.2012.0-alt1 +- new version 8.2012.0 + +* Tue Aug 18 2020 Alexey Shabalin 8.2006.0-alt1 +- 8.2006.0 + +* Tue Jan 22 2019 Alexey Shabalin 8.1901.0-alt1 +- 2019.01 Release +- add clickhouse package + +* Wed Jan 02 2019 Alexey Shabalin 8.40.0-alt1 +- 8.40.0 + +* Fri Nov 09 2018 Alexey Shabalin 8.39.0-alt1 +- 8.39.0 + +* Mon Oct 01 2018 Alexey Shabalin 8.38.0-alt1 +- new version 8.38.0 + +* Mon Sep 03 2018 Alexey Shabalin 8.37.0-alt1 +- 8.37.0 +- add package with openssl TLS driver +- build without liblogging (without rfc3195 too) + +* Wed May 16 2018 Alexey Shabalin 8.35.0-alt1 +- 8.35.0 + +* Sat Apr 07 2018 Alexey Shabalin 8.34.0-alt1 +- 8.34.0 + +* Tue Jan 09 2018 Alexey Shabalin 8.32.0-alt1 +- 8.32.0 + +* Fri Dec 01 2017 Alexey Shabalin 8.31.0-alt1 +- 8.31.0 +- update systemd drop-in config (ALT#32812) + +* Wed Nov 08 2017 Alexey Shabalin 8.30.0-alt1 +- 8.30.0 + +* Mon Oct 16 2017 Aleksei Nikiforov 8.28.0-alt2 +- Rebuilt with libdbi-0.9.0. + +* Mon Sep 18 2017 Gordeev Mikhail 8.28.0-alt1.1 +- Rebuild with libhiredis 1.13.3 + +* Tue Jul 11 2017 Alexey Shabalin 8.28.0-alt1 +- 8.28.0 + +* Thu Jun 15 2017 Alexey Shabalin 8.27.0-alt1 +- 8.27.0 + +* Wed Feb 22 2017 Alexey Shabalin 8.25.0-alt1 +- 8.25.0 + +* Fri Jan 13 2017 Alexey Shabalin 8.24.0-alt1 +- 8.24.0 + +* Wed Apr 20 2016 Alexey Shabalin 8.18.0-alt1 +- 8.18.0 + +* Thu Feb 25 2016 Alexey Shabalin 8.16.0-alt3 +- add load imuxsock module to rsyslog-classic config +- upadte altlinux-rsyslog-extrasockets script +- move altlinux-rsyslog-extrasockets script to rsyslog-classic +- add drop-in config rsyslog.service.d/classic.conf to rsyslog-classic +- drop $IncludeConfig /etc/syslog.conf from rsyslog.conf (in 00_classic.conf now) + +* Wed Feb 24 2016 Eugene Prokopiev 8.16.0-alt2 +- extract rsyslog-classic +- comment all input modules and add commented imjournal +- unit cleanup + +* Tue Jan 26 2016 Alexey Shabalin 8.16.0-alt1 +- 8.16.0 +- add pmpanngfw to extra package + +* Tue Nov 17 2015 Alexey Shabalin 8.14.0-alt1 +- 8.14.0 + +* Mon Aug 17 2015 Alexey Shabalin 8.12.0-alt1 +- 8.12.0 + +* Thu Jul 02 2015 Alexey Shabalin 8.11.0-alt1 +- 8.11.0 + +* Thu Apr 09 2015 Alexey Shabalin 8.9.0-alt1 +- 8.9.0 + +* Wed Jan 14 2015 Alexey Shabalin 8.7.0-alt1 +- 8.7.0 + +* Fri Dec 05 2014 Alexey Shabalin 8.6.0-alt1 +- 8.6.0 + +* Thu Oct 09 2014 Alexey Shabalin 8.4.2-alt1 +- 8.4.2 (v8-stable) +- fixed CVE-2014-3634, CVE-2014-3683 + +* Wed Jun 04 2014 Alexey Shabalin 8.2.2-alt2 +- build with libjson-c-devel + +* Wed Jun 04 2014 Alexey Shabalin 8.2.2-alt1 +- 8.2.2 + +* Thu Apr 24 2014 Alexey Shabalin 8.2.1-alt1 +- 8.2.1 + +* Fri Jan 10 2014 Alexey Shabalin 7.4.8-alt3 +- drop SysSock.Unlink=off option (ALT#29666) + +* Fri Jan 10 2014 Alexey Shabalin 7.4.8-alt2 +- fixed run for SysV + +* Thu Jan 09 2014 Alexey Shabalin 7.4.8-alt1 +- 7.4.8 + +* Tue Dec 10 2013 Alexey Shabalin 7.4.7-alt1 +- 7.4.7 + +* Thu Nov 07 2013 Alexey Shabalin 7.4.6-alt1 +- 7.4.6 + +* Tue Oct 22 2013 Alexey Shabalin 7.4.5-alt1 +- 7.4.5 + +* Wed Jul 31 2013 Alexey Shabalin 7.4.3-alt1 +- 7.4.3 + +* Thu Jul 11 2013 Alexey Shabalin 7.4.1-alt1 +- 7.4.1 +- add journal subpackage +- add crypto subpackage + +* Fri Apr 26 2013 Alexey Shabalin 7.2.7-alt1 +- 7.2.7 + +* Thu Mar 14 2013 Alexey Shabalin 7.2.6-alt1 +- 7.2.6 + +* Thu Jan 17 2013 Alexey Shabalin 7.2.5-alt1 +- 7.2.5 + +* Mon Dec 10 2012 Alexey Shabalin 7.2.4-alt1 +- 7.2.4 + +* Thu Dec 06 2012 Alexey Shabalin 7.2.3-alt1 +- snapshot v7-stable branch +- add imkmsg.so plugin to base package +- add imdiag.so, impstats.so, omstdout.so, pmrfc3164sd.so to extra package +- add packages: + + mongo (ommongodb plugin) + + mmaudit + + mmjsonparse + + elasticsearch + + hiredis +- move mmnormalize.so from extra package to separate mmnormalize package + +* Fri Oct 12 2012 Alexey Shabalin 6.4.2-alt2 +- fix logging chrooted services - add imuxsock module to generated config + +* Thu Sep 20 2012 Alexey Shabalin 6.4.2-alt1 +- 6.4.2 + +* Wed Sep 19 2012 Alexey Shabalin 6.4.1-alt1 +- 6.4.1 new stable release + +* Tue Jul 17 2012 Alexey Shabalin 6.2.2-alt2 +- fix unit file for systemd-186 + +* Fri Jun 22 2012 Alexey Shabalin 6.2.2-alt1 +- 6.2.2 + +* Fri May 11 2012 Alexey Shabalin 6.2.1-alt1 +- 6.2.1 + +* Fri Mar 02 2012 Alexey Shabalin 6.2.0-alt1 +- 6.2.0 new stable release +- add plugins imttcp and mmnormalize to extra + +* Fri Mar 02 2012 Alexey Shabalin 5.8.7-alt1 +- 5.8.7 + +* Fri Oct 21 2011 Alexey Shabalin 5.8.6-alt1 +- 5.8.6 + +* Wed Sep 14 2011 Alexey Shabalin 5.8.5-alt1 +- 5.8.5 + +* Wed Aug 10 2011 Alexey Shabalin 5.8.4-alt1 +- 5.8.4 + +* Thu Jul 28 2011 Alexey Shabalin 5.8.3-alt1 +- 5.8.3 + +* Wed Jun 29 2011 Alexey Shabalin 5.8.2-alt1 +- 5.8.2 +- add dir /var/spool/rsyslog for spool + +* Thu May 19 2011 Alexey Shabalin 5.8.1-alt1 +- 5.8.1 +- add mmsnmptrapd module to extra package +- do not unlink sockets files in ALTLinux +- revert generate 00_extrasockets.conf in init script, but without option enable/disable +- update systemd.service for run generate 00_extrasockets.conf + +* Tue May 10 2011 Alexey Shabalin 5.8.0-alt2 +- revert function reload to init script +- add reload for systemd +- add touch/rm lock in systemd-service file, needed for /sbin/reload-syslog + +* Thu Apr 21 2011 Alexey Shabalin 5.8.0-alt1 +- 5.8.0 +- update BR: +- update configure options +- add {post,preun}_service +- package docs as noarch +- add more subpackages +- copy syslog.conf from sysklog package +- add configs from mandriva +- use configs from /etc/rsyslog.d/ and syslog.conf +- package systemd service file +- add aliase rsyslogd to rsyslog for systemd +- add autostart for systemd +- change permition for config files +- update init script +- add conflicts to syslogd and klogd +- drop Packager +- Don't create database in scripts + +* Tue Jan 13 2009 Ivan Fedorov 3.20.2-alt2 +- add configs & init-script +- update from upstream +- extract pgsql support to subpackage + +* Sat Dec 20 2008 Ivan Fedorov 3.20.2-alt1 +- 3.20.2 + + security fix +- change prefix from /usr to /. + +* Fri Nov 07 2008 Ivan Fedorov 3.20.0-alt1 +- 3.20.0 + +* Sun Nov 02 2008 Ivan Fedorov 3.18.5-alt1 +- Initial build for ALT Linux diff --git a/rsyslogd.alt b/rsyslogd.alt new file mode 100644 index 000000000..e8dbdf8fd --- /dev/null +++ b/rsyslogd.alt @@ -0,0 +1,5 @@ +# Options for rsyslogd +# Syslogd options are deprecated since rsyslog v3. +# If you want to use them, switch to compatibility mode 2 by "-c2" +# See rsyslogd(8) for more details +RSYSLOGD_OPTIONS="" diff --git a/rsyslogd.init b/rsyslogd.init new file mode 100755 index 000000000..4e0c0f89a --- /dev/null +++ b/rsyslogd.init @@ -0,0 +1,130 @@ +#!/bin/sh +# +# rsyslogd Starts rsyslogd. +# +# +# chkconfig: 2345 30 99 +# description: Syslog is the facility by which many daemons use to log \ +# messages to various system log files. It is a good idea to always \ +# run syslog. +### BEGIN INIT INFO +# Provides: $syslog +# Required-Start: $local_fs +# Required-Stop: $local_fs +# Default-Start: 2 3 4 5 +# Default-Stop: 0 1 6 +# Short-Description: Enhanced system logging and kernel message trapping daemons +# Description: Rsyslog is an enhanced multi-threaded syslogd supporting, +# among others, MySQL, syslog/tcp, RFC 3195, permitted +# sender lists, filtering on any message part, and fine +# grain output format control. +### END INIT INFO + +WITHOUT_RC_COMPAT=1 + +# Source function library. +. /etc/init.d/functions + +SourceIfNotEmpty /etc/sysconfig/rsyslogd + +RSYSLOGD=/sbin/rsyslogd +[ -x "$RSYSLOGD" ] || exit + +PIDFILE=/var/run/rsyslogd.pid +LOCKFILE=/var/lock/subsys/rsyslogd +RETVAL=0 + +extrasockets() +{ + local CONF="/etc/rsyslog.d/20_extrasockets.conf" + local STRING="Generating list of extra sockets in /etc/syslog.d/" + + echo -n "$STRING " + + echo '# Do not edit manually. This file is autogenerated.' > $CONF + echo >> $CONF + + for LOGSOCK in $(ls -1 /etc/syslog.d/); do + echo '$AddUnixListenSocket ' $(readlink /etc/syslog.d/$LOGSOCK) >> $CONF + done + + RETVAL=$? + [ $RETVAL -eq 0 ] && success "$STRING" || failure "$STRING" + echo + + return $RETVAL +} + +start() +{ + extrasockets + start_daemon --pidfile "$PIDFILE" --lockfile "$LOCKFILE" --expect-user root -- rsyslogd $RSYSLOGD_OPTIONS + RETVAL=$? + return $RETVAL +} + +stop() +{ + stop_daemon --pidfile "$PIDFILE" --lockfile "$LOCKFILE" --expect-user root -- rsyslogd + RETVAL=$? + return $RETVAL +} + +reload() +{ + msg_reloading rsyslog + stop_daemon --pidfile "$PIDFILE" --expect-user root -HUP -- rsyslogd + RETVAL=$? + return $RETVAL +} + +restart() +{ + stop + start +} + +# See how we were called. +case "$1" in + start) + start + ;; + stop) + stop + ;; + status) + status --pidfile "$PIDFILE" rsyslogd + RETVAL=$? + ;; + reload) + reload + ;; + restart) + restart + ;; + condstart) + if [ ! -e "$LOCKFILE" ]; then + start + fi + ;; + condstop) + if [ -e "$LOCKFILE" ]; then + stop + fi + ;; + condreload) + if [ -e "$LOCKFILE" ]; then + reload + fi + ;; + condrestart) + if [ -e "$LOCKFILE" ]; then + restart + fi + ;; + *) + msg_usage "${0##*/} {start|stop|status|restart|reload|condstart|condstop|condrestart|condreload}" + RETVAL=1 +esac + +exit $RETVAL diff --git a/syslog.conf b/syslog.conf new file mode 100644 index 000000000..5684c6b05 --- /dev/null +++ b/syslog.conf @@ -0,0 +1,77 @@ +### +# Facilities +### + +# Kernel +kern.=debug;kern.=info;kern.=notice -/var/log/kernel/info +kern.=warning -/var/log/kernel/warnings +kern.err /var/log/kernel/errors + +# User +user.=debug;user.=info;user.=notice -/var/log/user/info +user.=warning -/var/log/user/warnings +user.err /var/log/user/errors + +# Mail +mail.=debug;mail.=info;mail.=notice -/var/log/mail/info +mail.=warning -/var/log/mail/warnings +mail.err /var/log/mail/errors +mail.* -/var/log/mail/all + +# Daemons +daemon.=debug;daemon.=info;daemon.=notice -/var/log/daemons/info +daemon.=warning -/var/log/daemons/warnings +daemon.err /var/log/daemons/errors + +# Auth +auth.* /var/log/auth/messages +authpriv.* /var/log/auth/secure +auth,authpriv.* -/var/log/auth/all + +# Printer +lpr.=debug;lpr.=info;lpr.=notice -/var/log/lpr/info +lpr.=warning -/var/log/lpr/warnings +lpr.err /var/log/lpr/errors + +# News +news.=debug;news.=info;news.=notice -/var/log/news/info +news.=warning -/var/log/news/warnings +news.err /var/log/news/errors + +# UUCP +uucp.=debug;uucp.=info;uucp.=notice -/var/log/uucp/info +uucp.=warning -/var/log/uucp/warnings +uucp.err /var/log/uucp/errors + +# Cron +cron.=debug;cron.=info;cron.=notice -/var/log/cron/info +cron.=warning -/var/log/cron/warnings +cron.err /var/log/cron/errors + +# FTP +ftp.=debug;ftp.=info;ftp.=notice -/var/log/ftp/info +ftp.=warning -/var/log/ftp/warnings +ftp.err /var/log/ftp/errors + +### +# Various +### + +# Log anything of level info or higher. +# Don't log mail and private authentication messages! +*.info;mail.none;authpriv.none -/var/log/syslog/messages + +# Log all alerts +*.alert /var/log/syslog/alert + +# Everybody gets emergency messages +*.emerg :omusrmsg:* + +# Save mail and news errors of level err and higher in a special file. +uucp,news.crit -/var/log/syslog/spooler + +# Save boot messages also to boot.log +local7.* -/var/log/syslog/boot + +# Log all to the console. +*.* /dev/tty12