aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2015-01-18 15:05:40 -0500
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2015-01-22 01:14:53 -0500
commita48a62a1af02aec4473c9deed98dd5b89d210f93 (patch)
tree6430c67afb3521718a43cce66be9def85bd8664b /tmpfiles.d
parenttmpfiles: implement augmenting of existing ACLs (diff)
downloadsystemd-a48a62a1af02aec4473c9deed98dd5b89d210f93.tar.gz
systemd-a48a62a1af02aec4473c9deed98dd5b89d210f93.tar.bz2
systemd-a48a62a1af02aec4473c9deed98dd5b89d210f93.zip
tmpfiles: use ACL magic on journal directories
Diffstat (limited to 'tmpfiles.d')
-rw-r--r--tmpfiles.d/systemd.conf.m48
1 files changed, 8 insertions, 0 deletions
diff --git a/tmpfiles.d/systemd.conf.m4 b/tmpfiles.d/systemd.conf.m4
index ad05f4333..b447b01f5 100644
--- a/tmpfiles.d/systemd.conf.m4
+++ b/tmpfiles.d/systemd.conf.m4
@@ -26,9 +26,17 @@ d /run/log 0755 root root -
z /run/log/journal 2755 root systemd-journal - -
Z /run/log/journal/%m ~2750 root systemd-journal - -
+m4_ifdef(`HAVE_ACL',``
+a+ /run/log/journal/%m - - - - d:group:adm:r-x,d:group:wheel:r-x
+A+ /run/log/journal/%m - - - - group:adm:r-x,group:wheel:r-x
+'')m4_dnl
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/%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
d /var/lib/systemd 0755 root root -
d /var/lib/systemd/coredump 0755 root root 3d