|
 |
1ff636 |
From 825d40b7ccdde8b4b9a5299d6e6747c80b9519e2 Mon Sep 17 00:00:00 2001
|
|
|
1ff636 |
From: Chris Morgan <chmorgan@gmail.com>
|
|
|
1ff636 |
Date: Sat, 21 Mar 2015 20:47:46 -0400
|
|
|
1ff636 |
Subject: [PATCH] man: add journal-remote.conf(5)
|
|
|
1ff636 |
|
|
|
1ff636 |
(cherry picked from commit eaa5251d9167027275d8275862e23e0b7dc8866e)
|
|
|
1ff636 |
|
|
|
1ff636 |
Cherry-picked from: 90d2614
|
|
|
1ff636 |
Resolves: #1222517
|
|
|
1ff636 |
---
|
|
|
23b3cf |
Makefile-man.am | 7 ++
|
|
|
23b3cf |
man/journal-remote.conf.xml | 114 +++++++++++++++++++++++++++++++++
|
|
|
1ff636 |
man/systemd-journal-remote.xml | 1 +
|
|
|
1ff636 |
3 files changed, 122 insertions(+)
|
|
|
1ff636 |
create mode 100644 man/journal-remote.conf.xml
|
|
|
1ff636 |
|
|
|
1ff636 |
diff --git a/Makefile-man.am b/Makefile-man.am
|
|
Pablo Greco |
48fc63 |
index ac6f69af70..084df754a2 100644
|
|
|
1ff636 |
--- a/Makefile-man.am
|
|
|
1ff636 |
+++ b/Makefile-man.am
|
|
|
1ff636 |
@@ -1358,14 +1358,20 @@ endif
|
|
|
1ff636 |
|
|
|
1ff636 |
if HAVE_MICROHTTPD
|
|
|
1ff636 |
MANPAGES += \
|
|
|
1ff636 |
+ man/journal-remote.conf.5 \
|
|
|
1ff636 |
man/systemd-journal-gatewayd.service.8 \
|
|
|
1ff636 |
man/systemd-journal-remote.8 \
|
|
|
1ff636 |
man/systemd-journal-upload.8
|
|
|
1ff636 |
MANPAGES_ALIAS += \
|
|
|
1ff636 |
+ man/journal-remote.conf.d.5 \
|
|
|
1ff636 |
man/systemd-journal-gatewayd.8 \
|
|
|
1ff636 |
man/systemd-journal-gatewayd.socket.8
|
|
|
1ff636 |
+man/journal-remote.conf.d.5: man/journal-remote.conf.5
|
|
|
1ff636 |
man/systemd-journal-gatewayd.8: man/systemd-journal-gatewayd.service.8
|
|
|
1ff636 |
man/systemd-journal-gatewayd.socket.8: man/systemd-journal-gatewayd.service.8
|
|
|
1ff636 |
+man/journal-remote.conf.d.html: man/journal-remote.conf.html
|
|
|
1ff636 |
+ $(html-alias)
|
|
|
1ff636 |
+
|
|
|
1ff636 |
man/systemd-journal-gatewayd.html: man/systemd-journal-gatewayd.service.html
|
|
|
1ff636 |
$(html-alias)
|
|
|
1ff636 |
|
|
|
1ff636 |
@@ -1662,6 +1668,7 @@ EXTRA_DIST += \
|
|
|
1ff636 |
man/hostname.xml \
|
|
|
1ff636 |
man/hostnamectl.xml \
|
|
|
1ff636 |
man/hwdb.xml \
|
|
|
1ff636 |
+ man/journal-remote.conf.xml \
|
|
|
1ff636 |
man/journalctl.xml \
|
|
|
1ff636 |
man/journald.conf.xml \
|
|
|
1ff636 |
man/kernel-command-line.xml \
|
|
|
1ff636 |
diff --git a/man/journal-remote.conf.xml b/man/journal-remote.conf.xml
|
|
|
1ff636 |
new file mode 100644
|
|
Pablo Greco |
48fc63 |
index 0000000000..a7b2227182
|
|
|
1ff636 |
--- /dev/null
|
|
|
1ff636 |
+++ b/man/journal-remote.conf.xml
|
|
|
1ff636 |
@@ -0,0 +1,114 @@
|
|
|
1ff636 |
+
|
|
|
1ff636 |
+
|
|
|
1ff636 |
+ "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
|
|
|
1ff636 |
+
|
|
|
1ff636 |
+
|
|
|
1ff636 |
+ This file is part of systemd.
|
|
|
1ff636 |
+
|
|
|
1ff636 |
+ Copyright 2015 Chris Morgan
|
|
|
1ff636 |
+
|
|
|
1ff636 |
+ systemd is free software; you can redistribute it and/or modify it
|
|
|
1ff636 |
+ under the terms of the GNU Lesser General Public License as published by
|
|
|
1ff636 |
+ the Free Software Foundation; either version 2.1 of the License, or
|
|
|
1ff636 |
+ (at your option) any later version.
|
|
|
1ff636 |
+
|
|
|
1ff636 |
+ systemd is distributed in the hope that it will be useful, but
|
|
|
1ff636 |
+ WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
1ff636 |
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
|
1ff636 |
+ Lesser General Public License for more details.
|
|
|
1ff636 |
+
|
|
|
1ff636 |
+ You should have received a copy of the GNU Lesser General Public License
|
|
|
1ff636 |
+ along with systemd; If not, see <http://www.gnu.org/licenses/>.
|
|
|
1ff636 |
+-->
|
|
|
1ff636 |
+
|
|
|
1ff636 |
+
|
|
|
1ff636 |
+ xmlns:xi="http://www.w3.org/2001/XInclude">
|
|
|
1ff636 |
+ <refentryinfo>
|
|
|
1ff636 |
+ <title>journal-remote.conf</title>
|
|
|
1ff636 |
+ <productname>systemd</productname>
|
|
|
1ff636 |
+
|
|
|
1ff636 |
+ <authorgroup>
|
|
|
1ff636 |
+ <author>
|
|
|
1ff636 |
+ <contrib>Developer</contrib>
|
|
|
1ff636 |
+ <firstname>Chris</firstname>
|
|
|
1ff636 |
+ <surname>Morgan</surname>
|
|
|
1ff636 |
+ <email>chmorgan@gmail.com</email>
|
|
|
1ff636 |
+ </author>
|
|
|
1ff636 |
+ </authorgroup>
|
|
|
1ff636 |
+ </refentryinfo>
|
|
|
1ff636 |
+
|
|
|
1ff636 |
+ <refmeta>
|
|
|
1ff636 |
+ <refentrytitle>journal-remote.conf</refentrytitle>
|
|
|
1ff636 |
+ <manvolnum>5</manvolnum>
|
|
|
1ff636 |
+ </refmeta>
|
|
|
1ff636 |
+
|
|
|
1ff636 |
+ <refnamediv>
|
|
|
1ff636 |
+ <refname>journal-remote.conf</refname>
|
|
|
1ff636 |
+ <refname>journal-remote.conf.d</refname>
|
|
|
1ff636 |
+ <refpurpose>Journal remote service configuration files</refpurpose>
|
|
|
1ff636 |
+ </refnamediv>
|
|
|
1ff636 |
+
|
|
|
1ff636 |
+ <refsynopsisdiv>
|
|
|
1ff636 |
+ <para><filename>/etc/systemd/journal-remote.conf</filename></para>
|
|
|
1ff636 |
+ <para><filename>/etc/systemd/journald.conf.d/*.conf</filename></para>
|
|
|
1ff636 |
+ <para><filename>/run/systemd/journald.conf.d/*.conf</filename></para>
|
|
|
1ff636 |
+ <para><filename>/usr/lib/systemd/journald.conf.d/*.conf</filename></para>
|
|
|
1ff636 |
+ </refsynopsisdiv>
|
|
|
1ff636 |
+
|
|
|
1ff636 |
+ <refsect1>
|
|
|
1ff636 |
+ <title>Description</title>
|
|
|
1ff636 |
+
|
|
|
1ff636 |
+ <para>These files configure various parameters of the systemd-remote-journal
|
|
|
1ff636 |
+ application,
|
|
|
1ff636 |
+ <citerefentry><refentrytitle>systemd-journal-remote</refentrytitle><manvolnum>8</manvolnum></citerefentry>.</para>
|
|
|
1ff636 |
+ </refsect1>
|
|
|
1ff636 |
+
|
|
|
1ff636 |
+ <xi:include href="standard-conf.xml" xpointer="main-conf" />
|
|
|
1ff636 |
+
|
|
|
1ff636 |
+ <refsect1>
|
|
|
1ff636 |
+ <title>Options</title>
|
|
|
1ff636 |
+
|
|
|
1ff636 |
+ <para>All options are configured in the
|
|
|
1ff636 |
+ <literal>[Remote]</literal> section:</para>
|
|
|
1ff636 |
+
|
|
|
1ff636 |
+ <variablelist>
|
|
|
1ff636 |
+
|
|
|
1ff636 |
+ <varlistentry>
|
|
|
1ff636 |
+ <term><varname>SplitMode=</varname></term>
|
|
|
1ff636 |
+
|
|
|
1ff636 |
+ <listitem><para>One of <literal>host</literal> or <literal>none</literal>.
|
|
|
1ff636 |
+ </para></listitem>
|
|
|
1ff636 |
+ </varlistentry>
|
|
|
1ff636 |
+
|
|
|
1ff636 |
+ <varlistentry>
|
|
|
1ff636 |
+ <term><varname>ServerKeyFile=</varname></term>
|
|
|
1ff636 |
+
|
|
|
1ff636 |
+ <listitem><para>SSL key in PEM format</para></listitem>
|
|
|
1ff636 |
+ </varlistentry>
|
|
|
1ff636 |
+
|
|
|
1ff636 |
+ <varlistentry>
|
|
|
1ff636 |
+ <term><varname>ServerCertificateFile=</varname></term>
|
|
|
1ff636 |
+
|
|
|
1ff636 |
+ <listitem><para>SSL CA certificate in PEM format.</para></listitem>
|
|
|
1ff636 |
+ </varlistentry>
|
|
|
1ff636 |
+
|
|
|
1ff636 |
+ <varlistentry>
|
|
|
1ff636 |
+ <term><varname>TrustedCertificateFile=</varname></term>
|
|
|
1ff636 |
+
|
|
|
1ff636 |
+ <listitem><para>SSL CA certificate.</para></listitem>
|
|
|
1ff636 |
+ </varlistentry>
|
|
|
1ff636 |
+
|
|
|
1ff636 |
+ </variablelist>
|
|
|
1ff636 |
+
|
|
|
1ff636 |
+ </refsect1>
|
|
|
1ff636 |
+
|
|
|
1ff636 |
+ <refsect1>
|
|
|
1ff636 |
+ <title>See Also</title>
|
|
|
1ff636 |
+ <para>
|
|
|
1ff636 |
+ <citerefentry><refentrytitle>systemd-journal-remote</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
|
|
|
1ff636 |
+ <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
|
|
|
1ff636 |
+ <citerefentry><refentrytitle>systemd-journald.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>
|
|
|
1ff636 |
+ </para>
|
|
|
1ff636 |
+ </refsect1>
|
|
|
1ff636 |
+
|
|
|
1ff636 |
+</refentry>
|
|
|
1ff636 |
diff --git a/man/systemd-journal-remote.xml b/man/systemd-journal-remote.xml
|
|
Pablo Greco |
48fc63 |
index 2687662a14..d5bda635c4 100644
|
|
|
1ff636 |
--- a/man/systemd-journal-remote.xml
|
|
|
1ff636 |
+++ b/man/systemd-journal-remote.xml
|
|
|
1ff636 |
@@ -310,6 +310,7 @@ systemd-journal-remote --url http://some.host:19531/
|
|
|
1ff636 |
<citerefentry><refentrytitle>journalctl</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
|
|
|
1ff636 |
<citerefentry><refentrytitle>systemd-journald.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
|
|
|
1ff636 |
<citerefentry><refentrytitle>systemd-journal-gatewayd.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>
|
|
|
1ff636 |
+ <citerefentry><refentrytitle>journal-remote.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>
|
|
|
1ff636 |
</para>
|
|
|
1ff636 |
</refsect1>
|
|
|
1ff636 |
</refentry>
|