diff options
author | Jan Synacek <jsynacek@redhat.com> | 2019-05-02 14:08:39 +0200 |
---|---|---|
committer | Lukáš Nykrýn <lnykryn@redhat.com> | 2019-05-02 15:30:21 +0200 |
commit | 7b87977aaa9017c7307cc0645c019b9abd4654d6 (patch) | |
tree | 26910b23c73daf1c1c10ca77785153980b1fe1ea | |
parent | 7b629b3a853c3b1e4e6a916a080996960343d7f2 (diff) | |
download | systemd-7b87977aaa9017c7307cc0645c019b9abd4654d6.tar.gz |
Revert "journal: remove journal audit socket"
This reverts commit 8618ef2fb30b4139c9bec4e45fb499cd8192a87f.
Resolves: #1699287
-rw-r--r-- | units/meson.build | 2 | ||||
-rw-r--r-- | units/systemd-journald-audit.socket | 22 | ||||
-rw-r--r-- | units/systemd-journald.service.in | 4 |
3 files changed, 26 insertions, 2 deletions
diff --git a/units/meson.build b/units/meson.build index e54a84ccbf..e4ac6ced64 100644 --- a/units/meson.build +++ b/units/meson.build @@ -89,6 +89,8 @@ units = [ 'sockets.target.wants/'], ['systemd-journal-gatewayd.socket', 'ENABLE_REMOTE HAVE_MICROHTTPD'], ['systemd-journal-remote.socket', 'ENABLE_REMOTE HAVE_MICROHTTPD'], + ['systemd-journald-audit.socket', '', + 'sockets.target.wants/'], ['systemd-journald-dev-log.socket', '', 'sockets.target.wants/'], ['systemd-journald.socket', '', diff --git a/units/systemd-journald-audit.socket b/units/systemd-journald-audit.socket new file mode 100644 index 0000000000..cb8b774963 --- /dev/null +++ b/units/systemd-journald-audit.socket @@ -0,0 +1,22 @@ +# 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 Audit Socket +Documentation=man:systemd-journald.service(8) man:journald.conf(5) +DefaultDependencies=no +Before=sockets.target +ConditionSecurity=audit +ConditionCapability=CAP_AUDIT_READ + +[Socket] +Service=systemd-journald.service +ReceiveBuffer=128M +ListenNetlink=audit 1 +PassCredentials=yes diff --git a/units/systemd-journald.service.in b/units/systemd-journald.service.in index 2d5fd0120d..4eab2fa841 100644 --- a/units/systemd-journald.service.in +++ b/units/systemd-journald.service.in @@ -12,12 +12,12 @@ Description=Journal Service Documentation=man:systemd-journald.service(8) man:journald.conf(5) DefaultDependencies=no Requires=systemd-journald.socket -After=systemd-journald.socket systemd-journald-dev-log.socket syslog.socket +After=systemd-journald.socket systemd-journald-dev-log.socket systemd-journald-audit.socket syslog.socket Before=sysinit.target [Service] Type=notify -Sockets=systemd-journald.socket systemd-journald-dev-log.socket +Sockets=systemd-journald.socket systemd-journald-dev-log.socket systemd-journald-audit.socket ExecStart=@rootlibexecdir@/systemd-journald Restart=always RestartSec=0 |