aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2015-11-29 18:37:01 -0500
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2015-11-29 18:37:01 -0500
commit57d5b3130cd34b9a844f4258f55c1134b27bc5ad (patch)
tree03abc2b08d059a1d972340ab3fce74042738a3aa /tmpfiles.d
parentacl-util: only set the mask if not present (diff)
downloadsystemd-57d5b3130cd34b9a844f4258f55c1134b27bc5ad.tar.gz
systemd-57d5b3130cd34b9a844f4258f55c1134b27bc5ad.tar.bz2
systemd-57d5b3130cd34b9a844f4258f55c1134b27bc5ad.zip
tmpfiles: also set acls on /var/log/journal
This way, directories created later for containers or for journald-remote, will be readable by adm & wheel groups by default, similarly to /var/log/journal/%m itself. https://github.com/systemd/systemd/issues/1971
Diffstat (limited to 'tmpfiles.d')
-rw-r--r--tmpfiles.d/systemd.conf.m42
1 files changed, 2 insertions, 0 deletions
diff --git a/tmpfiles.d/systemd.conf.m4 b/tmpfiles.d/systemd.conf.m4
index d9d51af92..fcd6ec026 100644
--- a/tmpfiles.d/systemd.conf.m4
+++ b/tmpfiles.d/systemd.conf.m4
@@ -34,6 +34,8 @@ A+ /run/log/journal/%m - - - - group:adm:r-x,group:wheel:r-x
z /var/log/journal 2755 root systemd-journal - -
z /var/log/journal/%m 2755 root systemd-journal - -
m4_ifdef(`HAVE_ACL',``
+a+ /var/log/journal - - - - d:group:adm:r-x,d:group:wheel:r-x
+a+ /var/log/journal - - - - group:adm:r-x,group:wheel:r-x
a+ /var/log/journal/%m - - - - d:group:adm:r-x,d:group:wheel:r-x
a+ /var/log/journal/%m - - - - group:adm:r-x,group:wheel:r-x
'')m4_dnl