core updated.
This commit is contained in:
Ertuğrul Erata
@@ -9,7 +9,7 @@ from pisi.actionsapi import autotools
|
||||
from pisi.actionsapi import pisitools
|
||||
|
||||
def setup():
|
||||
pisitools.cflags.add('-fpie -DSYSLOGD_PIDNAME=\\"syslogd.pid\\"')
|
||||
#pisitools.cflags.add('-fpie -DSYSLOGD_PIDNAME=\\"syslogd.pid\\"')
|
||||
pisitools.ldflags.add("-pie -Wl,-z,relro -Wl,-z,now")
|
||||
|
||||
autotools.configure("\
|
||||
@@ -25,8 +25,9 @@ def setup():
|
||||
--disable-testbench \
|
||||
--disable-mmnormalize \
|
||||
--disable-gssapi-krb5 \
|
||||
--disable-generate-man-pages \
|
||||
--disable-uuid \
|
||||
--enable-mail \
|
||||
--enable-uuid \
|
||||
--enable-zlib \
|
||||
--enable-imdiag \
|
||||
--enable-imfile \
|
||||
@@ -47,6 +48,7 @@ def setup():
|
||||
--enable-unlimited-select \
|
||||
--enable-pmaixforwardedfrom \
|
||||
--enable-cached-man-pages \
|
||||
--with-systemdsystemunitdir=no \
|
||||
")
|
||||
|
||||
pisitools.dosed("libtool", " -shared ", " -Wl,-O1,--as-needed -shared ")
|
||||
|
||||
@@ -6,12 +6,12 @@ serviceDesc = _({"en": "System Message Logger",
|
||||
"tr": "Sistem Günlükleme Hizmeti"})
|
||||
serviceDefault = "on"
|
||||
|
||||
PIDFILE = "/run/syslogd.pid"
|
||||
PIDFILE = "/var/run/rsyslogd.pid"
|
||||
|
||||
@synchronized
|
||||
def start():
|
||||
startService(command="/usr/bin/rsyslogd",
|
||||
args=config.get("SYSLOGD_OPTIONS", "-c 4"),
|
||||
args=config.get("SYSLOGD_OPTIONS", ""),
|
||||
pidfile=PIDFILE,
|
||||
detach=True)
|
||||
|
||||
|
||||
@@ -0,0 +1,95 @@
|
||||
#######################
|
||||
### DEFAULT ACTIONS ###
|
||||
#######################
|
||||
|
||||
auth,authpriv.* action(
|
||||
type="omfile"
|
||||
File="/var/log/auth.log"
|
||||
FileCreateMode="0600"
|
||||
FileOwner="root"
|
||||
FileGroup="adm"
|
||||
Sync="off"
|
||||
)
|
||||
|
||||
cron.* action(
|
||||
type="omfile"
|
||||
File="/var/log/cron.log"
|
||||
FileOwner="root"
|
||||
FileGroup="adm"
|
||||
)
|
||||
|
||||
daemon.* action(
|
||||
type="omfile"
|
||||
File="/var/log/daemon.log"
|
||||
FileOwner="root"
|
||||
FileGroup="adm"
|
||||
)
|
||||
|
||||
kern.* action(
|
||||
type="omfile"
|
||||
File="/var/log/kern.log"
|
||||
FileOwner="root"
|
||||
FileGroup="adm"
|
||||
)
|
||||
|
||||
lpr.* action(
|
||||
type="omfile"
|
||||
File="/var/log/lpr.log"
|
||||
FileOwner="root"
|
||||
FileGroup="adm"
|
||||
)
|
||||
|
||||
mail.* action(
|
||||
type="omfile"
|
||||
File="/var/log/mail.log"
|
||||
FileOwner="root"
|
||||
FileGroup="adm"
|
||||
)
|
||||
|
||||
news.* action(
|
||||
type="omfile"
|
||||
File="/var/log/news.log"
|
||||
FileOwner="root"
|
||||
FileGroup="adm"
|
||||
)
|
||||
|
||||
user.* action(
|
||||
type="omfile"
|
||||
File="/var/log/user.log"
|
||||
FileOwner="root"
|
||||
FileGroup="adm"
|
||||
)
|
||||
|
||||
*.=debug;auth,authpriv,news,mail.none action(
|
||||
type="omfile"
|
||||
File="/var/log/debug.log"
|
||||
FileOwner="root"
|
||||
FileGroup="adm"
|
||||
)
|
||||
|
||||
*.info;auth,authpriv,cron,daemon,lpr,mail,news.none action(
|
||||
type="omfile"
|
||||
File="/var/log/messages"
|
||||
FileOwner="root"
|
||||
FileGroup="adm"
|
||||
)
|
||||
|
||||
# Uncomment the following directive to re-enable the
|
||||
# deprecated "/var/log/syslog" log file (don't forget to re-enable log
|
||||
# rotation in "/etc/logrotate.d/rsyslog" if you do that!)
|
||||
#*.*;auth,authpriv.none action(
|
||||
# type="omfile"
|
||||
# File="/var/log/syslog"
|
||||
# FileOwner="root"
|
||||
# FileGroup="adm"
|
||||
#)
|
||||
|
||||
*.emerg action(
|
||||
type="omusrmsg"
|
||||
Users="*"
|
||||
action.execOnlyOnceEveryInterval="10"
|
||||
)
|
||||
|
||||
# Create an additional socket for the default chroot location
|
||||
# (used by net-misc/openssh[hpn], see https://bugs.gentoo.org/490744)
|
||||
input(type="imuxsock" Socket="/var/empty/dev/log")
|
||||
@@ -1,95 +1,61 @@
|
||||
#rsyslog v3 config file
|
||||
# /etc/rsyslog.conf
|
||||
#
|
||||
# This configuration is based on RainerScript, the new recommended syntax
|
||||
# for RSYSLOG. See http://www.rsyslog.com/doc/rainerscript.html for further
|
||||
# details.
|
||||
#
|
||||
# But if you don't want to learn something new at moment, don't worry: The
|
||||
# legacy syntax is still supported.
|
||||
#
|
||||
# You may want to use the new RSYSLOG configuration builder to create your
|
||||
# own more advanced configuration: http://www.rsyslog.com/rsyslog-configuration-builder/
|
||||
|
||||
# if you experience problems, check
|
||||
# http://www.rsyslog.com/troubleshoot for assistance
|
||||
|
||||
#### MODULES ####
|
||||
|
||||
$ModLoad imuxsock.so # provides support for local system logging (e.g. via logger command)
|
||||
$ModLoad imklog.so # provides kernel logging support (previously done by rklogd)
|
||||
$ModLoad immark.so # provides --MARK-- message capability
|
||||
|
||||
# Provides UDP syslog reception
|
||||
#$ModLoad imudp.so
|
||||
#$UDPServerRun 514
|
||||
|
||||
# Provides TCP syslog reception
|
||||
#$ModLoad imtcp.so
|
||||
#$InputTCPServerRun 514
|
||||
# Check config syntax on startup and abort if unclean (default: off)
|
||||
#$AbortOnUncleanConfig on
|
||||
|
||||
|
||||
#### GLOBAL DIRECTIVES ####
|
||||
###############
|
||||
### MODULES ###
|
||||
###############
|
||||
|
||||
# Use default timestamp format
|
||||
$ActionFileDefaultTemplate RSYSLOG_TraditionalFileFormat
|
||||
# Read syslog messages from default Unix socket /dev/log (e.g. via logger command)
|
||||
module(load="imuxsock")
|
||||
|
||||
# File syncing capability is disabled by default. This feature is usually not required,
|
||||
# not useful and an extreme performance hit
|
||||
#$ActionFileEnableSync on
|
||||
# Read messages from the kernel log and submits them to the syslog engine
|
||||
module(load="imklog")
|
||||
|
||||
# Inject "--MARK--" messages every $Interval (seconds)
|
||||
#module(load="immark" Interval="600")
|
||||
|
||||
# Read syslog messages from UDP
|
||||
#module(load="imudp")
|
||||
#input(type="imudp" port="514")
|
||||
|
||||
# Read syslog messages from TCP
|
||||
#module(load="imtcp")
|
||||
#input(type="imtcp" port="514")
|
||||
|
||||
|
||||
## ### begin forwarding rule ###
|
||||
# The statement between the begin ... end define a SINGLE forwarding
|
||||
# rule. They belong together, do NOT split them. If you create multiple
|
||||
# forwarding rules, duplicate the whole block!
|
||||
# Remote Logging (we use TCP for reliable delivery)
|
||||
#
|
||||
# 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.
|
||||
#$WorkDirectory /var/spppl/rsyslog # where to place spool files
|
||||
#$ActionQueueFileName fwdRule1 # unique name prefix for spool files
|
||||
#$ActionQueueMaxDiskSpace 1g # 1gb space limit (use as much as possible)
|
||||
#$ActionQueueSaveOnShutdown on # save messages to disk on shutdown
|
||||
#$ActionQueueType LinkedList # run asynchronously
|
||||
#$ActionResumeRetryCount -1 # infinite retries if host is down
|
||||
# remote host is: name/ip:port, e.g. 192.168.0.1:514, port optional
|
||||
#*.* @@remote-host:514
|
||||
# ### end of the forwarding rule ###
|
||||
#########################
|
||||
### GLOBAL DIRECTIVES ###
|
||||
#########################
|
||||
|
||||
# Where to place spool and state files
|
||||
$WorkDirectory /var/spool/rsyslog
|
||||
|
||||
# Reduce repeating messages (default: off)
|
||||
#$RepeatedMsgReduction on
|
||||
|
||||
# Set defaults for every output file
|
||||
$Umask 0022
|
||||
|
||||
module(
|
||||
load="builtin:omfile"
|
||||
Template="RSYSLOG_TraditionalFileFormat"
|
||||
FileCreateMode="0644"
|
||||
DirCreateMode="0755"
|
||||
)
|
||||
|
||||
|
||||
#### RULES ####
|
||||
|
||||
auth,authpriv.* /var/log/auth.log
|
||||
*.*;auth,authpriv.none -/var/log/syslog
|
||||
|
||||
daemon.* -/var/log/daemon.log
|
||||
user.* -/var/log/user.log
|
||||
|
||||
# Log kernel stuff
|
||||
kern.* -/var/log/kern.log
|
||||
|
||||
# Log all the mail messages in one place.
|
||||
mail.* -/var/log/mail.log
|
||||
|
||||
# Log cron stuff
|
||||
cron.* /var/log/cron.log
|
||||
|
||||
#
|
||||
# Logging for the mail system. Split it up so that
|
||||
# it is easy to write scripts to parse these files.
|
||||
#
|
||||
mail.info -/var/log/mail.info
|
||||
mail.warn -/var/log/mail.warn
|
||||
mail.err /var/log/mail.err
|
||||
|
||||
# Logging for INN news system
|
||||
#
|
||||
news.crit /var/log/news/news.crit
|
||||
news.err /var/log/news/news.err
|
||||
news.notice -/var/log/news/news.notice
|
||||
|
||||
#
|
||||
# Some `catch-all' logfiles.
|
||||
#
|
||||
*.=debug;\
|
||||
auth,authpriv.none;\
|
||||
news.none;mail.none -/var/log/debug
|
||||
*.=info;*.=notice;*.=warn;\
|
||||
auth,authpriv.none;\
|
||||
cron,daemon.none;\
|
||||
mail,news.none -/var/log/messages
|
||||
|
||||
# Emergencies are sent to everybody logged in.
|
||||
#
|
||||
*.emerg *
|
||||
|
||||
# Include all conf files in /etc/rsyslog.d/
|
||||
$IncludeConfig /etc/rsyslog.d/*.conf
|
||||
|
||||
@@ -1,6 +1,37 @@
|
||||
/var/log/messages /var/log/mail.log /var/log/cron.log {
|
||||
sharedscripts
|
||||
postrotate
|
||||
/bin/kill -HUP `cat /run/syslogd.pid 2> /dev/null` 2> /dev/null || true
|
||||
endscript
|
||||
# Uncomment the following directive if you have re-enabled
|
||||
# "/var/log/syslog" in "/etc/rsyslog.d/50-default.conf"
|
||||
#/var/log/syslog
|
||||
#{
|
||||
# rotate 7
|
||||
# daily
|
||||
# missingok
|
||||
# notifempty
|
||||
# delaycompress
|
||||
# compress
|
||||
# postrotate
|
||||
# test -r /run/rsyslogd.pid && kill -HUP $(cat /run/rsyslogd.pid) &>/dev/null
|
||||
# endscript
|
||||
#}
|
||||
|
||||
/var/log/auth.log
|
||||
/var/log/cron.log
|
||||
/var/log/daemon.log
|
||||
/var/log/kern.log
|
||||
/var/log/lpr.log
|
||||
/var/log/mail.log
|
||||
/var/log/news.log
|
||||
/var/log/user.log
|
||||
/var/log/debug.log
|
||||
/var/log/messages
|
||||
{
|
||||
rotate 4
|
||||
weekly
|
||||
missingok
|
||||
notifempty
|
||||
compress
|
||||
delaycompress
|
||||
sharedscripts
|
||||
postrotate
|
||||
test -r /run/rsyslogd.pid && kill -HUP $(cat /run/rsyslogd.pid) &>/dev/null
|
||||
endscript
|
||||
}
|
||||
|
||||
@@ -1,5 +1,30 @@
|
||||
# Options to syslogd
|
||||
# syslogd options are deprecated since rsyslog v3
|
||||
# if you want to use them, switch to compatibility mode 2 by "-c 2"
|
||||
SYSLOGD_OPTIONS="-c 4"
|
||||
# /etc/conf.d/rsyslog
|
||||
|
||||
# Configuration file
|
||||
RSYSLOG_CONFIGFILE="/etc/rsyslog.conf"
|
||||
|
||||
# PID file
|
||||
# If you should ever change this, remember to update
|
||||
# "/etc/logrotate.d/rsyslog", too.
|
||||
RSYSLOG_PIDFILE="/run/rsyslogd.pid"
|
||||
|
||||
# You can use this configuration option to pass additional options to the
|
||||
# start-stop-daemon, see start-stop-daemon(8) for more details.
|
||||
# Per default we wait 1000ms after we have started the service to ensure
|
||||
# that the daemon is really up and running.
|
||||
RSYSLOG_SSDARGS="--wait 1000"
|
||||
|
||||
# The termination timeout (start-stop-daemon parameter "retry") ensures
|
||||
# that the service will be terminated within a given time (60 + 5 seconds
|
||||
# per default) when you are stopping the service.
|
||||
# You need to increase the value when you are working with a large queue.
|
||||
# See http://www.rsyslog.com/doc/queues.html for further information.
|
||||
RSYSLOG_TERMTIMEOUT="TERM/60/KILL/5"
|
||||
|
||||
|
||||
# Options to rsyslogd
|
||||
# See rsyslogd(8) for more details
|
||||
# Notes:
|
||||
# * Do not specify another PIDFILE but use the variable above to change the location
|
||||
# * Do not specify another CONFIGFILE but use the variable above to change the location
|
||||
RSYSLOG_OPTS=""
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
<IsA>service</IsA>
|
||||
<Summary>Enhanced system logging and kernel message trapping daemons</Summary>
|
||||
<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. It is quite compatible with stock sysklogd and can be used as a drop-in replacement.</Description>
|
||||
<Archive sha1sum="1f6ab5eec635adff84361a376663ca7bd7473f5b" type="targz">http://www.rsyslog.com/files/download/rsyslog/rsyslog-7.6.3.tar.gz</Archive>
|
||||
<Archive sha1sum="e8d767f0c3e0b7ed0e20bf3e2513d3c2d5c30239" type="targz">http://www.rsyslog.com/files/download/rsyslog/rsyslog-8.9.0.tar.gz</Archive>
|
||||
<BuildDependencies>
|
||||
<Dependency>zlib-devel</Dependency>
|
||||
<Dependency>json-c-devel</Dependency>
|
||||
@@ -28,7 +28,6 @@
|
||||
<Dependency>zlib</Dependency>
|
||||
<Dependency>json-c</Dependency>
|
||||
<Dependency>libestr</Dependency>
|
||||
<Dependency>libuuid</Dependency>
|
||||
<Dependency>libgcrypt</Dependency>
|
||||
<Dependency>liblogging</Dependency>
|
||||
</RuntimeDependencies>
|
||||
@@ -39,11 +38,13 @@
|
||||
<Path fileType="doc">/usr/share/doc</Path>
|
||||
<Path fileType="config">/etc/logrotate.d</Path>
|
||||
<Path fileType="config">/etc/conf.d</Path>
|
||||
<Path fileType="config">/etc/rsyslog.d</Path>
|
||||
<Path fileType="config">/etc/rsyslog.conf</Path>
|
||||
</Files>
|
||||
<AdditionalFiles>
|
||||
<AdditionalFile owner="root" permission="0644" target="/etc/logrotate.d/rsyslog">rsyslog.logrotate</AdditionalFile>
|
||||
<AdditionalFile owner="root" permission="0644" target="/etc/rsyslog.conf">rsyslog.conf</AdditionalFile>
|
||||
<AdditionalFile owner="root" permission="0644" target="/etc/rsyslog.d/50-default.conf">50-default.conf</AdditionalFile>
|
||||
<AdditionalFile owner="root" permission="0644" target="/etc/conf.d/rsyslog">rsyslog.sysconfig</AdditionalFile>
|
||||
</AdditionalFiles>
|
||||
<Provides>
|
||||
@@ -52,6 +53,13 @@
|
||||
</Package>
|
||||
|
||||
<History>
|
||||
<Update release="7">
|
||||
<Date>2015-05-05</Date>
|
||||
<Version>8.9.0</Version>
|
||||
<Comment>Version bump.</Comment>
|
||||
<Name>Ertuğrul Erata</Name>
|
||||
<Email>ertugrulerata@gmail.com</Email>
|
||||
</Update>
|
||||
<Update release="6">
|
||||
<Date>2014-05-11</Date>
|
||||
<Version>7.6.3</Version>
|
||||
|
||||
Reference in New Issue
Block a user