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