diff options
author | Lennart Poettering <lennart@poettering.net> | 2019-11-25 15:37:35 +0100 |
---|---|---|
committer | Lennart Poettering <lennart@poettering.net> | 2020-01-31 15:01:30 +0100 |
commit | 1ee51fbd7075dc066c2bb506edd6471a00758e0a (patch) | |
tree | 2541b01078e395a266d1f9dd6f53eadbcc57bebc /units | |
parent | b1852c48c12754f7d0e7705150b7f9488f34f4a9 (diff) | |
download | systemd-1ee51fbd7075dc066c2bb506edd6471a00758e0a.tar.gz |
units: add unit files for instantiated journal daemons
Diffstat (limited to 'units')
-rw-r--r-- | units/meson.build | 2 | ||||
-rw-r--r-- | units/systemd-journald@.service.in | 46 | ||||
-rw-r--r-- | units/systemd-journald@.socket | 24 |
3 files changed, 72 insertions, 0 deletions
diff --git a/units/meson.build b/units/meson.build index d99cafb39f..c0b69566d1 100644 --- a/units/meson.build +++ b/units/meson.build @@ -114,6 +114,7 @@ units = [ ['systemd-kexec.service', ''], ['systemd-machine-id-commit.service', '', 'sysinit.target.wants/'], + ['systemd-journald@.socket', ''], ['systemd-networkd.socket', 'ENABLE_NETWORKD'], ['systemd-poweroff.service', ''], ['systemd-reboot.service', ''], @@ -180,6 +181,7 @@ in_units = [ ['systemd-journal-upload.service', 'ENABLE_REMOTE HAVE_LIBCURL'], ['systemd-journald.service', '', 'sysinit.target.wants/'], + ['systemd-journald@.service', ''], ['systemd-localed.service', 'ENABLE_LOCALED', 'dbus-org.freedesktop.locale1.service'], ['systemd-logind.service', 'ENABLE_LOGIND', diff --git a/units/systemd-journald@.service.in b/units/systemd-journald@.service.in new file mode 100644 index 0000000000..e7274925a9 --- /dev/null +++ b/units/systemd-journald@.service.in @@ -0,0 +1,46 @@ +# SPDX-License-Identifier: LGPL-2.1+ +# +# This file is part of systemd. +# +# systemd is free software; you can redistribute it and/or modify it +# 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. + +[Unit] +Description=Journal Service for Namespace %i +Documentation=man:systemd-journald.service(8) man:journald.conf(5) +Requires=systemd-journald@%i.socket +After=systemd-journald@%i.socket + +[Service] +CapabilityBoundingSet=CAP_SYS_ADMIN CAP_DAC_OVERRIDE CAP_SYS_PTRACE CAP_CHOWN CAP_DAC_READ_SEARCH CAP_FOWNER CAP_SETUID CAP_SETGID CAP_MAC_OVERRIDE +DevicePolicy=closed +ExecStart=@rootlibexecdir@/systemd-journald %i +FileDescriptorStoreMax=4224 +Group=systemd-journal +IPAddressDeny=any +LockPersonality=yes +LogsDirectory=journal/%m.%i +LogsDirectoryMode=02755 +MemoryDenyWriteExecute=yes +NoNewPrivileges=yes +Restart=always +RestartSec=0 +RestrictAddressFamilies=AF_UNIX AF_NETLINK +RestrictNamespaces=yes +RestrictRealtime=yes +RestrictSUIDSGID=yes +RuntimeDirectory=systemd/journal.%i +RuntimeDirectoryPreserve=yes +Sockets=systemd-journald@%i.socket +StandardOutput=null +SystemCallArchitectures=native +SystemCallErrorNumber=EPERM +SystemCallFilter=@system-service +Type=notify +@SERVICE_WATCHDOG@ + +# If there are many split up journal files we need a lot of fds to access them +# all in parallel. +LimitNOFILE=@HIGH_RLIMIT_NOFILE@ diff --git a/units/systemd-journald@.socket b/units/systemd-journald@.socket new file mode 100644 index 0000000000..3badd7842a --- /dev/null +++ b/units/systemd-journald@.socket @@ -0,0 +1,24 @@ +# SPDX-License-Identifier: LGPL-2.1+ +# +# This file is part of systemd. +# +# systemd is free software; you can redistribute it and/or modify it +# 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. + +[Unit] +Description=Journal Socket for Namespace %i +Documentation=man:systemd-journald.service(8) man:journald.conf(5) +StopWhenUnneeded=yes + +[Socket] +Service=systemd-journald@%i.service +ListenStream=/run/systemd/journal.%i/stdout +ListenDatagram=/run/systemd/journal.%i/socket +ListenDatagram=/run/systemd/journal.%i/dev-log +SocketMode=0666 +PassCredentials=yes +PassSecurity=yes +ReceiveBuffer=8M +SendBuffer=8M |