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