mirror of
https://github.com/systemd/systemd-stable.git
synced 2025-01-08 21:17:47 +03:00
Zbigniew Jędrzejewski-Szmek
parent
a8d46a1663
commit
50e666288b
@ -2272,19 +2272,25 @@ endif
|
||||
if HAVE_MICROHTTPD
|
||||
MANPAGES += \
|
||||
man/journal-remote.conf.5 \
|
||||
man/journal-upload.conf.5 \
|
||||
man/systemd-journal-gatewayd.service.8 \
|
||||
man/systemd-journal-remote.8 \
|
||||
man/systemd-journal-upload.8
|
||||
MANPAGES_ALIAS += \
|
||||
man/journal-remote.conf.d.5 \
|
||||
man/journal-upload.conf.d.5 \
|
||||
man/systemd-journal-gatewayd.8 \
|
||||
man/systemd-journal-gatewayd.socket.8
|
||||
man/journal-remote.conf.d.5: man/journal-remote.conf.5
|
||||
man/journal-upload.conf.d.5: man/journal-upload.conf.5
|
||||
man/systemd-journal-gatewayd.8: man/systemd-journal-gatewayd.service.8
|
||||
man/systemd-journal-gatewayd.socket.8: man/systemd-journal-gatewayd.service.8
|
||||
man/journal-remote.conf.d.html: man/journal-remote.conf.html
|
||||
$(html-alias)
|
||||
|
||||
man/journal-upload.conf.d.html: man/journal-upload.conf.html
|
||||
$(html-alias)
|
||||
|
||||
man/systemd-journal-gatewayd.html: man/systemd-journal-gatewayd.service.html
|
||||
$(html-alias)
|
||||
|
||||
@ -2607,6 +2613,7 @@ EXTRA_DIST += \
|
||||
man/hostnamectl.xml \
|
||||
man/hwdb.xml \
|
||||
man/journal-remote.conf.xml \
|
||||
man/journal-upload.conf.xml \
|
||||
man/journalctl.xml \
|
||||
man/journald.conf.xml \
|
||||
man/kernel-command-line.xml \
|
||||
|
||||
@ -45,22 +45,21 @@
|
||||
<refnamediv>
|
||||
<refname>journal-remote.conf</refname>
|
||||
<refname>journal-remote.conf.d</refname>
|
||||
<refpurpose>Journal remote service configuration files</refpurpose>
|
||||
<refpurpose>Configuration files for the service accepting remote journal uploads</refpurpose>
|
||||
</refnamediv>
|
||||
|
||||
<refsynopsisdiv>
|
||||
<para><filename>/etc/systemd/journal-remote.conf</filename></para>
|
||||
<para><filename>/etc/systemd/journald.conf.d/*.conf</filename></para>
|
||||
<para><filename>/run/systemd/journald.conf.d/*.conf</filename></para>
|
||||
<para><filename>/usr/lib/systemd/journald.conf.d/*.conf</filename></para>
|
||||
<para><filename>/etc/systemd/journal-remote.conf.d/*.conf</filename></para>
|
||||
<para><filename>/run/systemd/journal-remote.conf.d/*.conf</filename></para>
|
||||
<para><filename>/usr/lib/systemd/journal-remote.conf.d/*.conf</filename></para>
|
||||
</refsynopsisdiv>
|
||||
|
||||
<refsect1>
|
||||
<title>Description</title>
|
||||
|
||||
<para>These files configure various parameters of the systemd-remote-journal
|
||||
application,
|
||||
<citerefentry><refentrytitle>systemd-journal-remote</refentrytitle><manvolnum>8</manvolnum></citerefentry>.</para>
|
||||
<para>These files configure various parameters of
|
||||
<citerefentry><refentrytitle>systemd-journal-remote.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>.</para>
|
||||
</refsect1>
|
||||
|
||||
<xi:include href="standard-conf.xml" xpointer="main-conf" />
|
||||
|
||||
113
man/journal-upload.conf.xml
Normal file
113
man/journal-upload.conf.xml
Normal file
@ -0,0 +1,113 @@
|
||||
<?xml version='1.0'?> <!--*-nxml-*-->
|
||||
<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
|
||||
"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
|
||||
|
||||
<!--
|
||||
This file is part of systemd.
|
||||
|
||||
Copyright 2016 Zbigniew Jędrzejewski-Szmek
|
||||
|
||||
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.
|
||||
|
||||
systemd is distributed in the hope that it will be useful, but
|
||||
WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
Lesser General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU Lesser General Public License
|
||||
along with systemd; If not, see <http://www.gnu.org/licenses/>.
|
||||
-->
|
||||
|
||||
<refentry id="journal-upload.conf" conditional='HAVE_MICROHTTPD'
|
||||
xmlns:xi="http://www.w3.org/2001/XInclude">
|
||||
<refentryinfo>
|
||||
<title>journal-upload.conf</title>
|
||||
<productname>systemd</productname>
|
||||
|
||||
<authorgroup>
|
||||
<author>
|
||||
<contrib>Monkey with a keyboard</contrib>
|
||||
<firstname>Zbigniew</firstname>
|
||||
<surname>Jędrzejewski-Szmek</surname>
|
||||
<email>zbyszek@in.waw.pl</email>
|
||||
</author>
|
||||
</authorgroup>
|
||||
</refentryinfo>
|
||||
|
||||
<refmeta>
|
||||
<refentrytitle>journal-upload.conf</refentrytitle>
|
||||
<manvolnum>5</manvolnum>
|
||||
</refmeta>
|
||||
|
||||
<refnamediv>
|
||||
<refname>journal-upload.conf</refname>
|
||||
<refname>journal-upload.conf.d</refname>
|
||||
<refpurpose>Configuration files for the journal upload service</refpurpose>
|
||||
</refnamediv>
|
||||
|
||||
<refsynopsisdiv>
|
||||
<para><filename>/etc/systemd/journal-upload.conf</filename></para>
|
||||
<para><filename>/etc/systemd/journal-upload.conf.d/*.conf</filename></para>
|
||||
<para><filename>/run/systemd/journal-upload.conf.d/*.conf</filename></para>
|
||||
<para><filename>/usr/lib/systemd/journal-upload.conf.d/*.conf</filename></para>
|
||||
</refsynopsisdiv>
|
||||
|
||||
<refsect1>
|
||||
<title>Description</title>
|
||||
|
||||
<para>These files configure various parameters of
|
||||
<citerefentry><refentrytitle>systemd-journal-upload.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>.</para>
|
||||
</refsect1>
|
||||
|
||||
<xi:include href="standard-conf.xml" xpointer="main-conf" />
|
||||
|
||||
<refsect1>
|
||||
<title>Options</title>
|
||||
|
||||
<para>All options are configured in the <literal>[Upload]</literal> section:</para>
|
||||
|
||||
<variablelist>
|
||||
<varlistentry>
|
||||
<term><varname>URL=</varname></term>
|
||||
|
||||
<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>
|
||||
</varlistentry>
|
||||
|
||||
<varlistentry>
|
||||
<term><varname>ServerKeyFile=</varname></term>
|
||||
|
||||
<listitem><para>SSL key in PEM format.</para></listitem>
|
||||
</varlistentry>
|
||||
|
||||
<varlistentry>
|
||||
<term><varname>ServerCertificateFile=</varname></term>
|
||||
|
||||
<listitem><para>SSL CA certificate in PEM format.</para></listitem>
|
||||
</varlistentry>
|
||||
|
||||
<varlistentry>
|
||||
<term><varname>TrustedCertificateFile=</varname></term>
|
||||
|
||||
<listitem><para>SSL CA certificate.</para></listitem>
|
||||
</varlistentry>
|
||||
|
||||
</variablelist>
|
||||
|
||||
</refsect1>
|
||||
|
||||
<refsect1>
|
||||
<title>See Also</title>
|
||||
<para>
|
||||
<citerefentry><refentrytitle>systemd-journal-upload</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
|
||||
<citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
|
||||
<citerefentry><refentrytitle>systemd-journald.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>
|
||||
</para>
|
||||
</refsect1>
|
||||
|
||||
</refentry>
|
||||
Loading…
Reference in New Issue
Block a user