summaryrefslogtreecommitdiff
path: root/tmpfiles.d/systemd.conf.m4
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2015-11-30 17:53:39 +0100
committerLennart Poettering <lennart@poettering.net>2015-11-30 17:53:39 +0100
commita00405285e5ee25d7532f66f470b0bb7fb8df7de (patch)
treee5acf9d862a5f60887f138a235816860d90add49 /tmpfiles.d/systemd.conf.m4
parent3a89c3a0fcff52d02608da7d4f7d8183d620995b (diff)
parentafae249efa4774c6676738ac5de6aeb4daf4889f (diff)
Merge pull request #2063 from keszybz/issue-1977-2
journal: clean up permission setting and acl adjustements on user journals
Diffstat (limited to 'tmpfiles.d/systemd.conf.m4')
-rw-r--r--tmpfiles.d/systemd.conf.m44
1 files changed, 4 insertions, 0 deletions
diff --git a/tmpfiles.d/systemd.conf.m4 b/tmpfiles.d/systemd.conf.m4
index d9d51af929..0575408dbe 100644
--- a/tmpfiles.d/systemd.conf.m4
+++ b/tmpfiles.d/systemd.conf.m4
@@ -33,9 +33,13 @@ 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 - -
+z /var/log/journal/%m/system.journal 0640 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
+a+ /var/log/journal/%m/system.journal - - - - group:adm:r--,group:wheel:r--
'')m4_dnl
d /var/lib/systemd 0755 root root -