12 Commits

Author SHA1 Message Date
Rainer Gerhards
bdc609639e cleanup: removed remains of -c option (compatibility mode)
both from code & doc and emitted warning message if still used
closes: http://bugzilla.adiscon.com/show_bug.cgi?id=361
Thanks to Michael Biebl for reporting & suggestions
2012-10-16 18:58:11 +02:00
Rainer Gerhards
2f8cd1aba7 Merge branch 'v5-stable' into v6-stable 2012-03-02 12:06:30 +01:00
Michael Biebl
2aecaa8536 Install syslog.service Alias for newer systemd versions
From the syslog.socket unit file of newer systemd versions:

The default syslog implementation should make syslog.service a
symlink to itself, so that this socket activates the right actual
syslog service.

Examples:

/etc/systemd/system/syslog.service ->
/lib/systemd/system/rsyslog.service
/etc/systemd/system/syslog.service ->
/lib/systemd/system/syslog-ng.service

Best way to achieve that is by adding this to your unit file
(i.e. to rsyslog.service or syslog-ng.service):

[Install]
Alias=syslog.service

http://cgit.freedesktop.org/systemd/systemd/tree/units/syslog.socket#n26
2012-03-02 11:00:15 +01:00
Rainer Gerhards
8fbefa688f Merge branch 'v5-stable' into beta
Conflicts:
	ChangeLog
	doc/manual.html
2011-07-06 08:36:58 +02:00
Lennart Poettering
6e222ec9ef systemd: direct stdout/stderr of rsyslog to null
This allows systemd upstream to set stdout/stderr of all spawned
services by default to 'syslog'. In order to avoid log loops rsyslog
itself must be have its stdout/stderr connected to 'null' in that case,
however.
2011-07-02 12:54:39 +02:00
Rainer Gerhards
3b8b32e822 adapted systemd rsyslog service file to v6 2011-03-11 10:25:29 +01:00
Lennart Poettering
fd26a42bdc systemd: do not hook up SIGHUP for reload
rsyslog doesn't actually do a configuration reload on SIGHUP, hence
let's not pretend it does and drop the ExecReload= line, so that the
clients will rather restart than reload the service.
2011-03-11 09:59:17 +01:00
Lennart Poettering
906b04e97e systemd: use standard syslog.socket unit
In systemd we now have a standard socket unit for /dev/log called
syslog.socket. This unit can be shared between an early boot mini syslog
and the full syslog implementation started later on. The mini syslog is
shipped along systemd and does nothing but simply forward the data
received through /dev/log to the kernel log buffer (i.e. kmsg, as
visible by dmesg). It is run during early boot, and then as soon as
rsyslog starts up it is terminated, so that rsyslog can take over the
/dev/log socket. Since one of the first things rsyslog does after
starting up is flushing the kernel log buffer to disk we end up with all
data from early boot up in syslog.

This patch changes two things: removes rsyslog.socket and instead
configures rsyslog.service to take possession of syslock.socket. And
secondly includes a PreStart line to terminate the running syslog bridge
instance.
2011-03-09 09:33:20 +01:00
Michael Biebl
da75472096 systemd: add ExecReload command (using kill -HUP)
http://0pointer.de/public/systemd-man/systemd.service.html
2010-12-03 14:54:07 +01:00
Michael Biebl
ed324a9a61 Enable rsyslog.socket together with rsyslog.service
When the rsyslog service is enabled via
"systemctl enable rsyslog.service" also enable the socket unit.
2010-10-07 13:53:40 +02:00
Rainer Gerhards
b3aa4c696a minor: corrected -c param in systemd startup files 2010-10-04 12:30:43 +02:00
Lennart Poettering
8e51241a50 systemd: install service and socket unit files
This adds a systemd socket and service unit file to the default install
if systemd is found or explicitly enabled in ./configure.

Patch is against current git v5-devel.
2010-10-04 12:29:56 +02:00