daandemeyer / rpms / systemd

Forked from rpms/systemd 2 years ago
Clone
1ff636
From c45af40e61ab34508862f9e668f47cc6eb2f6d45 Mon Sep 17 00:00:00 2001
1ff636
From: Lukas Nykryn <lnykryn@redhat.com>
1ff636
Date: Thu, 16 Apr 2015 10:50:10 +0200
1ff636
Subject: [PATCH] journal: remove audit socket unit-files
1ff636
1ff636
---
1ff636
 Makefile.am                         |  6 ++----
1ff636
 units/systemd-journald-audit.socket | 19 -------------------
1ff636
 units/systemd-journald.service.in   |  4 ++--
1ff636
 3 files changed, 4 insertions(+), 25 deletions(-)
1ff636
 delete mode 100644 units/systemd-journald-audit.socket
1ff636
1ff636
diff --git a/Makefile.am b/Makefile.am
c62b8e
index bec32c39e5..6d6b650f24 100644
1ff636
--- a/Makefile.am
1ff636
+++ b/Makefile.am
1ff636
@@ -4518,8 +4518,7 @@ bin_PROGRAMS += \
1ff636
 
1ff636
 dist_systemunit_DATA += \
1ff636
 	units/systemd-journald.socket \
1ff636
-	units/systemd-journald-dev-log.socket \
1ff636
-	units/systemd-journald-audit.socket
1ff636
+	units/systemd-journald-dev-log.socket
1ff636
 
1ff636
 nodist_systemunit_DATA += \
1ff636
 	units/systemd-journald.service \
1ff636
@@ -4539,8 +4538,7 @@ dist_catalog_DATA = \
1ff636
 
1ff636
 SOCKETS_TARGET_WANTS += \
1ff636
 	systemd-journald.socket \
1ff636
-	systemd-journald-dev-log.socket \
1ff636
-	systemd-journald-audit.socket
1ff636
+	systemd-journald-dev-log.socket
1ff636
 
1ff636
 SYSINIT_TARGET_WANTS += \
1ff636
 	systemd-journald.service \
1ff636
diff --git a/units/systemd-journald-audit.socket b/units/systemd-journald-audit.socket
1ff636
deleted file mode 100644
c62b8e
index 35397aaeb8..0000000000
1ff636
--- a/units/systemd-journald-audit.socket
1ff636
+++ /dev/null
1ff636
@@ -1,19 +0,0 @@
1ff636
-#  This file is part of systemd.
1ff636
-#
1ff636
-#  systemd is free software; you can redistribute it and/or modify it
1ff636
-#  under the terms of the GNU Lesser General Public License as published by
1ff636
-#  the Free Software Foundation; either version 2.1 of the License, or
1ff636
-#  (at your option) any later version.
1ff636
-
1ff636
-[Unit]
1ff636
-Description=Journal Audit Socket
1ff636
-Documentation=man:systemd-journald.service(8) man:journald.conf(5)
1ff636
-DefaultDependencies=no
1ff636
-Before=sockets.target
1ff636
-ConditionSecurity=audit
1ff636
-
1ff636
-[Socket]
1ff636
-Service=systemd-journald.service
1ff636
-ReceiveBuffer=128M
1ff636
-ListenNetlink=audit 1
1ff636
-PassCredentials=yes
1ff636
diff --git a/units/systemd-journald.service.in b/units/systemd-journald.service.in
c62b8e
index 87704bb9c1..1bcc290ec4 100644
1ff636
--- a/units/systemd-journald.service.in
1ff636
+++ b/units/systemd-journald.service.in
1ff636
@@ -10,12 +10,12 @@ Description=Journal Service
1ff636
 Documentation=man:systemd-journald.service(8) man:journald.conf(5)
1ff636
 DefaultDependencies=no
1ff636
 Requires=systemd-journald.socket
1ff636
-After=systemd-journald.socket systemd-journald-dev-log.socket systemd-journald-audit.socket syslog.socket
1ff636
+After=systemd-journald.socket systemd-journald-dev-log.socket syslog.socket
1ff636
 Before=sysinit.target
1ff636
 
1ff636
 [Service]
1ff636
 Type=notify
1ff636
-Sockets=systemd-journald.socket systemd-journald-dev-log.socket systemd-journald-audit.socket
1ff636
+Sockets=systemd-journald.socket systemd-journald-dev-log.socket
1ff636
 ExecStart=@rootlibexecdir@/systemd-journald
1ff636
 Restart=always
1ff636
 RestartSec=0