X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=units%2Fsyslog.socket;h=c784357627e04e0388f7172ad8f901deb651a4c4;hp=f9e3171522628b15e5dd62239cd120edc8d2e3f8;hb=746e436dc54510fe142f5046a557e5006bc7e2aa;hpb=dc1ecd78e9f046880d10ddb45cf9b06df1084b10

diff --git a/units/syslog.socket b/units/syslog.socket
index f9e317152..c78435762 100644
--- a/units/syslog.socket
+++ b/units/syslog.socket
@@ -1,31 +1,43 @@
 #  This file is part of systemd.
 #
 #  systemd is free software; you can redistribute it and/or modify it
-#  under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2 of the License, or
+#  under the terms of the GNU Lesser General Public License as published by
+#  the Free Software Foundation; either version 2.1 of the License, or
 #  (at your option) any later version.
 
-# See systemd.special(7) for details
-
 [Unit]
 Description=Syslog Socket
+Documentation=man:systemd.special(7)
+Documentation=http://www.freedesktop.org/wiki/Software/systemd/syslog
 DefaultDependencies=no
-Before=sockets.target syslog.target
+Before=sockets.target syslog.target shutdown.target
+
+# Don't allow logging until the very end
+Conflicts=shutdown.target
 
 # Pull in syslog.target to tell people that /dev/log is now accessible
 Wants=syslog.target
 
 [Socket]
-ListenDatagram=/run/systemd/syslog
+ListenDatagram=/run/systemd/journal/syslog
 SocketMode=0666
-PassCred=yes
+PassCredentials=yes
+PassSecurity=yes
+ReceiveBuffer=8M
 
-# The service we activate on incoming traffic is
-# systemd-kmsg-syslogd.service. That doesn't mean however, that this
-# is the main syslog daemon in the system. Another syslog
-# implementation (which might be started via on-boot or another
-# non-socket activation) can take over possession of the socket and
-# terminate systemd-kmsg-syslogd. It could also simply replace the
-# socket in the file system, and leave systemd-kmsg-syslogd untouched.
-
-Service=systemd-kmsg-syslogd.service
+# 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
+#
+# See http://www.freedesktop.org/wiki/Software/systemd/syslog for details.