shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2024-12-28 07:21:32 +03:00
Code

Merge pull request #8926 from keszybz/man-journal-remote

Browse Source 
Small additions to sd-journal-{remote,upload}.service man pages
This commit is contained in:
Yu Watanabe 2018-05-08 17:56:51 +09:00 committed by GitHub
commit 6157694dc6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 21 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
man/journal-upload.conf.xml
View File

@ -68,7 +68,8 @@
<listitem><para>The URL to upload the journal entries to. See the description
of <varname>--url=</varname> option in
<citerefentry><refentrytitle>systemd-journal-upload</refentrytitle><manvolnum>8</manvolnum></citerefentry>
for the description of possible values.</para></listitem>
for the description of possible values. There is no default value, so either this
option or the command-line option must be always present to make an upload.</para></listitem>
</varlistentry>
<varlistentry>

25
man/systemd-journal-remote.service.xml
View File

@ -56,18 +56,19 @@
<refsect1>
<title>Description</title>
<para>
<filename>systemd-journal-remote</filename> is a command to
receive serialized journal events and store them to the journal.
Input streams are in the
<ulink url="https://www.freedesktop.org/wiki/Software/systemd/export">
Journal Export Format
</ulink>,
i.e. like the output from
<command>journalctl --output=export</command>. For transport over
the network, this serialized stream is usually carried over an
HTTPS connection.
</para>
<para><command>systemd-journal-remote</command> is a command to receive serialized journal
events and store them to journal files. Input streams are in the
<ulink url="https://www.freedesktop.org/wiki/Software/systemd/export">Journal Export Format</ulink>,
i.e. like the output from <command>journalctl --output=export</command>. For transport over the
network, this serialized stream is usually carried over an HTTPS connection.</para>
<para><filename>systemd-journal-remote.service</filename> is a system service that uses
<command>systemd-journal-remote</command> to listen for connections.
<filename>systemd-journal-remote.socket</filename> configures the network address that
<filename>systemd-journal-remote.service</filename> listens on. By default this is port 19532.
What connections are accepted and how the received data is stored can be configured through the
<citerefentry><refentrytitle>journal-remote.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>
configuration file.</para>
</refsect1>
<refsect1>

6
man/systemd-journal-upload.service.xml
View File

@ -61,6 +61,12 @@
Unless limited by one of the options specified below, all journal entries accessible to the user
the program is running as will be uploaded, and then the program will wait and send new entries
as they become available.</para>
<para><filename>systemd-journal-upload.service</filename> is a system service that uses
<command>systemd-journal-upload</command> to upload journal entries to a server. It uses the
configuration in
<citerefentry><refentrytitle>journal-upload.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>.
At least the <varname>URL=</varname> option must be specified.</para>
</refsect1>
<refsect1>