daandemeyer / rpms / systemd

Forked from rpms/systemd 2 years ago
Clone
803fb7
From 2b089fee5954986c932845887ed2cfd889bd4410 Mon Sep 17 00:00:00 2001
803fb7
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
803fb7
Date: Sun, 29 Nov 2015 18:37:01 -0500
803fb7
Subject: [PATCH] tmpfiles: also set acls on /var/log/journal
803fb7
803fb7
This way, directories created later for containers or for
803fb7
journald-remote, will be readable by adm & wheel groups by default,
803fb7
similarly to /var/log/journal/%m itself.
803fb7
803fb7
https://github.com/systemd/systemd/issues/1971
803fb7
(cherry picked from commit 57d5b3130cd34b9a844f4258f55c1134b27bc5ad)
803fb7
Related: #1411199
803fb7
---
803fb7
 tmpfiles.d/systemd.conf.m4 | 2 ++
803fb7
 1 file changed, 2 insertions(+)
803fb7
803fb7
diff --git a/tmpfiles.d/systemd.conf.m4 b/tmpfiles.d/systemd.conf.m4
803fb7
index d9d51af92..fcd6ec026 100644
803fb7
--- a/tmpfiles.d/systemd.conf.m4
803fb7
+++ b/tmpfiles.d/systemd.conf.m4
803fb7
@@ -34,6 +34,8 @@ A+ /run/log/journal/%m - - - - group:adm:r-x,group:wheel:r-x
803fb7
 z /var/log/journal 2755 root systemd-journal - -
803fb7
 z /var/log/journal/%m 2755 root systemd-journal - -
803fb7
 m4_ifdef(`HAVE_ACL',``
803fb7
+a+ /var/log/journal    - - - - d:group:adm:r-x,d:group:wheel:r-x
803fb7
+a+ /var/log/journal    - - - - group:adm:r-x,group:wheel:r-x
803fb7
 a+ /var/log/journal/%m - - - - d:group:adm:r-x,d:group:wheel:r-x
803fb7
 a+ /var/log/journal/%m - - - - group:adm:r-x,group:wheel:r-x
803fb7
 '')m4_dnl