diff options
| author | Lennart Poettering <lennart@poettering.net> | 2017-08-09 21:09:13 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-09 21:09:13 +0200 |
| commit | 97f7e3663eac6dad4b7384c1c2e1915db03f0247 (patch) | |
| tree | 513ac33fd32bfc1ae9d956eba4c934d5e38c5673 /units | |
| parent | b3f5897f6e46f6dc54d9f46ea16258f558173500 (diff) | |
| parent | debe5d23760f7a1261bcd26f5f523acf225e75de (diff) | |
| download | systemd-97f7e3663eac6dad4b7384c1c2e1915db03f0247.tar.gz | |
Merge pull request #6467 from yuwata/journal-remote-units
units: use {State,Logs}Directory= if they are applicable
Diffstat (limited to 'units')
| -rw-r--r-- | units/systemd-coredump@.service.in | 2 | ||||
| -rw-r--r-- | units/systemd-journal-gatewayd.service.in | 4 | ||||
| -rw-r--r-- | units/systemd-journal-remote.service.in | 3 | ||||
| -rw-r--r-- | units/systemd-journal-upload.service.in | 2 |
4 files changed, 3 insertions, 8 deletions
diff --git a/units/systemd-coredump@.service.in b/units/systemd-coredump@.service.in index 18f2d2d605..f6044a4d3f 100644 --- a/units/systemd-coredump@.service.in +++ b/units/systemd-coredump@.service.in @@ -34,4 +34,4 @@ RestrictNamespaces=yes RestrictAddressFamilies=AF_UNIX SystemCallFilter=~@clock @cpu-emulation @debug @keyring @module @mount @obsolete @raw-io @reboot @swap SystemCallArchitectures=native -ReadWritePaths=/var/lib/systemd/coredump +StateDirectory=systemd/coredump diff --git a/units/systemd-journal-gatewayd.service.in b/units/systemd-journal-gatewayd.service.in index 42da3504b8..fd7a9718f7 100644 --- a/units/systemd-journal-gatewayd.service.in +++ b/units/systemd-journal-gatewayd.service.in @@ -12,14 +12,10 @@ Requires=systemd-journal-gatewayd.socket [Service] ExecStart=@rootlibexecdir@/systemd-journal-gatewayd -User=systemd-journal-gateway -Group=systemd-journal-gateway SupplementaryGroups=systemd-journal DynamicUser=yes -PrivateTmp=yes PrivateDevices=yes PrivateNetwork=yes -ProtectSystem=strict ProtectHome=yes ProtectControlGroups=yes ProtectKernelTunables=yes diff --git a/units/systemd-journal-remote.service.in b/units/systemd-journal-remote.service.in index 5404bf1c03..c24e673d82 100644 --- a/units/systemd-journal-remote.service.in +++ b/units/systemd-journal-remote.service.in @@ -13,7 +13,6 @@ Requires=systemd-journal-remote.socket [Service] ExecStart=@rootlibexecdir@/systemd-journal-remote --listen-https=-3 --output=/var/log/journal/remote/ User=systemd-journal-remote -Group=systemd-journal-remote WatchdogSec=3min PrivateTmp=yes PrivateDevices=yes @@ -28,7 +27,7 @@ RestrictRealtime=yes RestrictNamespaces=yes RestrictAddressFamilies=AF_UNIX AF_INET AF_INET6 SystemCallArchitectures=native -ReadWritePaths=/var/log/journal/remote +LogsDirectory=journal/remote [Install] Also=systemd-journal-remote.socket diff --git a/units/systemd-journal-upload.service.in b/units/systemd-journal-upload.service.in index d00b929211..b0bee3925e 100644 --- a/units/systemd-journal-upload.service.in +++ b/units/systemd-journal-upload.service.in @@ -28,7 +28,7 @@ RestrictRealtime=yes RestrictNamespaces=yes RestrictAddressFamilies=AF_UNIX AF_INET AF_INET6 SystemCallArchitectures=native -ReadWritePaths=/var/lib/systemd/journal-upload +StateDirectory=systemd/journal-upload # If there are many split up journal files we need a lot of fds to # access them all and combine |