rc-local: drop SysVStartPriority= field which is now obsolete

[elogind.git] / units / systemd-journald.service.in

diff --git a/units/systemd-journald.service.in b/units/systemd-journald.service.in
index 08858f38d79f5a4dcd2f57a15063da0d97dcbecb..8d380c84c9a9f0eaeac2069e7553a92a2159e3cc 100644 (file)
--- a/units/systemd-journald.service.in
+++ b/units/systemd-journald.service.in
@@ -1,24 +1,28 @@
 #  This file is part of systemd.
 #
 #  systemd is free software; you can redistribute it and/or modify it
 #  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.
 
 #  (at your option) any later version.
 

-# See systemd.special(7) for details
-

 [Unit]
 Description=Journal Service
 [Unit]
 Description=Journal Service

+Documentation=man:systemd-journald.service(8) man:journald.conf(5)

 DefaultDependencies=no
 Requires=systemd-journald.socket
 DefaultDependencies=no
 Requires=systemd-journald.socket

-After=systemd-journald.socket
-After=syslog.socket
+After=systemd-journald.socket systemd-journald-dev-log.socket systemd-journald-audit.socket syslog.socket
+Before=sysinit.target

 
 [Service]
 
 [Service]

+Type=notify
+Sockets=systemd-journald.socket systemd-journald-dev-log.socket systemd-journald-audit.socket

 ExecStart=@rootlibexecdir@/systemd-journald
 ExecStart=@rootlibexecdir@/systemd-journald

+Restart=always
+RestartSec=0

 NotifyAccess=all
 StandardOutput=null
 NotifyAccess=all
 StandardOutput=null

-#CapabilityBoundingSet=CAP_SYS_ADMIN CAP_SETUID CAP_SETGID CAP_DAC_OVERRIDE
+CapabilityBoundingSet=CAP_SYS_ADMIN CAP_DAC_OVERRIDE CAP_SYS_PTRACE CAP_SYSLOG CAP_AUDIT_CONTROL CAP_AUDIT_READ CAP_CHOWN CAP_DAC_READ_SEARCH CAP_FOWNER CAP_SETUID CAP_SETGID CAP_MAC_OVERRIDE
+WatchdogSec=1min

 
 # Increase the default a bit in order to allow many simultaneous
 # services being run since we keep one fd open per service.
 
 # Increase the default a bit in order to allow many simultaneous
 # services being run since we keep one fd open per service.