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