From c45af40e61ab34508862f9e668f47cc6eb2f6d45 Mon Sep 17 00:00:00 2001 From: Lukas Nykryn Date: Thu, 16 Apr 2015 10:50:10 +0200 Subject: [PATCH] journal: remove audit socket unit-files --- Makefile.am | 6 ++---- units/systemd-journald-audit.socket | 19 ------------------- units/systemd-journald.service.in | 4 ++-- 3 files changed, 4 insertions(+), 25 deletions(-) delete mode 100644 units/systemd-journald-audit.socket diff --git a/Makefile.am b/Makefile.am index bec32c39e5..6d6b650f24 100644 --- a/Makefile.am +++ b/Makefile.am @@ -4518,8 +4518,7 @@ bin_PROGRAMS += \ dist_systemunit_DATA += \ units/systemd-journald.socket \ - units/systemd-journald-dev-log.socket \ - units/systemd-journald-audit.socket + units/systemd-journald-dev-log.socket nodist_systemunit_DATA += \ units/systemd-journald.service \ @@ -4539,8 +4538,7 @@ dist_catalog_DATA = \ SOCKETS_TARGET_WANTS += \ systemd-journald.socket \ - systemd-journald-dev-log.socket \ - systemd-journald-audit.socket + systemd-journald-dev-log.socket SYSINIT_TARGET_WANTS += \ systemd-journald.service \ diff --git a/units/systemd-journald-audit.socket b/units/systemd-journald-audit.socket deleted file mode 100644 index 35397aaeb8..0000000000 --- a/units/systemd-journald-audit.socket +++ /dev/null @@ -1,19 +0,0 @@ -# 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 - -[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 87704bb9c1..1bcc290ec4 100644 --- a/units/systemd-journald.service.in +++ b/units/systemd-journald.service.in @@ -10,12 +10,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 systemd-journald-audit.socket syslog.socket +After=systemd-journald.socket systemd-journald-dev-log.socket syslog.socket Before=sysinit.target [Service] Type=notify -Sockets=systemd-journald.socket systemd-journald-dev-log.socket systemd-journald-audit.socket +Sockets=systemd-journald.socket systemd-journald-dev-log.socket ExecStart=@rootlibexecdir@/systemd-journald Restart=always RestartSec=0