anitazha / rpms / systemd

Forked from rpms/systemd 3 years ago
Clone

Blame SOURCES/0491-tmpfiles-also-set-acls-on-var-log-journal.patch

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