picnoir
/
Systemd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #6467 from yuwata/journal-remote-units 

units: use {State,Logs}Directory= if they are applicable
This commit is contained in:
Lennart Poettering 2017-08-09 21:09:13 +02:00 committed by GitHub
parent b3f5897f6e debe5d2376
commit 97f7e3663e
6 changed files with 3 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
tmpfiles.d/meson.build
View File

@ -22,7 +22,6 @@ endforeach
m4_files = [['etc.conf', ''],
['systemd.conf', ''],
['systemd-remote.conf', 'ENABLE_REMOTE'],
['var.conf', ''],
]

17
tmpfiles.d/systemd-remote.conf.m4
View File

@ -1,17 +0,0 @@
# This file is part of systemd.
#
# systemd is free software; you can redistribute it and/or modify it
# under the terms of the GNU Lesser General Public License as published by
# the Free Software Foundation; either version 2.1 of the License, or
# (at your option) any later version.
# See tmpfiles.d(5) for details
m4_ifdef(`HAVE_LIBCURL',
d /var/lib/systemd/journal-upload 0755 systemd-journal-upload systemd-journal-upload - -
)m4_dnl
m4_ifdef(`HAVE_MICROHTTPD',
z /var/log/journal/remote 2755 systemd-journal-remote systemd-journal-remote - -
z /run/log/journal/remote 2755 systemd-journal-remote systemd-journal-remote - -
)m4_dnl

2
units/systemd-coredump@.service.in
View File

@ -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

4
units/systemd-journal-gatewayd.service.in
View File

@ -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

3
units/systemd-journal-remote.service.in
View File

@ -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

2
units/systemd-journal-upload.service.in
View File

@ -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