diff options
author | Yu Watanabe <watanabe.yu+github@gmail.com> | 2017-12-04 15:42:48 +0900 |
---|---|---|
committer | Yu Watanabe <watanabe.yu+github@gmail.com> | 2017-12-05 23:30:50 +0900 |
commit | 3db93b3fc8a8c40efdc6cc2d9176f88431ea9c7b (patch) | |
tree | d0013b3703264f17dc897cf9faaf827363264c76 /man | |
parent | bf2d3d7cae71c7e8f30b7e8b63778c1880c5fdba (diff) | |
download | systemd-3db93b3fc8a8c40efdc6cc2d9176f88431ea9c7b.tar.gz |
man: journal-remote: add missing options
This adds documents about supported, mainly SSL related, options
in jurnal-remote, journal-upload, and journal-gatewayd.
Diffstat (limited to 'man')
-rw-r--r-- | man/custom-entities.ent.in | 1 | ||||
-rw-r--r-- | man/systemd-journal-gatewayd.service.xml | 7 | ||||
-rw-r--r-- | man/systemd-journal-remote.xml | 47 | ||||
-rw-r--r-- | man/systemd-journal-upload.xml | 42 |
4 files changed, 95 insertions, 2 deletions
diff --git a/man/custom-entities.ent.in b/man/custom-entities.ent.in index 0257c2a94f..9ea92384aa 100644 --- a/man/custom-entities.ent.in +++ b/man/custom-entities.ent.in @@ -5,3 +5,4 @@ <!ENTITY usergeneratordir @USER_GENERATOR_PATH@> <!ENTITY systemenvgeneratordir @SYSTEM_ENV_GENERATOR_PATH@> <!ENTITY userenvgeneratordir @USER_ENV_GENERATOR_PATH@> +<!ENTITY CERTIFICATE_ROOT @CERTIFICATE_ROOT@> diff --git a/man/systemd-journal-gatewayd.service.xml b/man/systemd-journal-gatewayd.service.xml index b82cc979e7..4d461d9be4 100644 --- a/man/systemd-journal-gatewayd.service.xml +++ b/man/systemd-journal-gatewayd.service.xml @@ -103,6 +103,13 @@ </varlistentry> <varlistentry> + <term><option>--trust=</option></term> + + <listitem><para>Specify the path to a file containing a + CA certificate in PEM format.</para></listitem> + </varlistentry> + + <varlistentry> <term><option>-D <replaceable>DIR</replaceable></option></term> <term><option>--directory=<replaceable>DIR</replaceable></option></term> diff --git a/man/systemd-journal-remote.xml b/man/systemd-journal-remote.xml index ba88df535b..658c7e07f4 100644 --- a/man/systemd-journal-remote.xml +++ b/man/systemd-journal-remote.xml @@ -1,6 +1,9 @@ <?xml version='1.0'?> <!--*- Mode: nxml; nxml-child-indent: 2; indent-tabs-mode: nil -*--> <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" -"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"> +"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [ +<!ENTITY % entities SYSTEM "custom-entities.ent" > +%entities; +]> <!-- SPDX-License-Identifier: LGPL-2.1+ @@ -198,6 +201,48 @@ </listitem> </varlistentry> + <varlistentry> + <term><option>--key=</option></term> + + <listitem><para> + Takes a path to a SSL key file in PEM format. + Defaults to <filename>&CERTIFICATE_ROOT;/private/journal-remote.pem</filename>. + This option can be used with <option>--listen-https=</option>. + </para></listitem> + </varlistentry> + + <varlistentry> + <term><option>--cert=</option></term> + + <listitem><para> + Takes a path to a SSL certificate file in PEM format. + Defaults to <filename>&CERTIFICATE_ROOT;/certs/journal-remote.pem</filename>. + This option can be used with <option>--listen-https=</option>. + </para></listitem> + </varlistentry> + + <varlistentry> + <term><option>--trust=</option></term> + + <listitem><para> + Takes a path to a SSL CA certificate file in PEM format, + or <option>all</option>. If <option>all</option> is set, + then certificate checking will be disabled. + Defaults to <filename>&CERTIFICATE_ROOT;/ca/trusted.pem</filename>. + This option can be used with <option>--listen-https=</option>. + </para></listitem> + </varlistentry> + + <varlistentry> + <term><option>--gnutls-log=</option></term> + + <listitem><para> + Takes a comma separated list of gnutls logging categories. + This option can be used with <option>--listen-http=</option> or + <option>--listen-https=</option>. + </para></listitem> + </varlistentry> + </variablelist> </refsect1> diff --git a/man/systemd-journal-upload.xml b/man/systemd-journal-upload.xml index 6fc477d75a..a43062a6d5 100644 --- a/man/systemd-journal-upload.xml +++ b/man/systemd-journal-upload.xml @@ -1,6 +1,9 @@ <?xml version='1.0'?> <!--*- Mode: nxml; nxml-child-indent: 2; indent-tabs-mode: nil -*--> <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" -"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"> +"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [ +<!ENTITY % entities SYSTEM "custom-entities.ent" > +%entities; +]> <!-- SPDX-License-Identifier: LGPL-2.1+ @@ -171,6 +174,43 @@ </para></listitem> </varlistentry> + <varlistentry> + <term><option>--follow</option><optional>=<replaceable>BOOL</replaceable></optional></term> + + <listitem><para> + If set to yes, then <command>systemd-journal-upload</command> waits for input. + </para></listitem> + </varlistentry> + + <varlistentry> + <term><option>--key=</option></term> + + <listitem><para> + Takes a path to a SSL key file in PEM format. + Defaults to <filename>&CERTIFICATE_ROOT;/private/journal-upload.pem</filename>. + </para></listitem> + </varlistentry> + + <varlistentry> + <term><option>--cert=</option></term> + + <listitem><para> + Takes a path to a SSL certificate file in PEM format. + Defaults to <filename>&CERTIFICATE_ROOT;/certs/journal-upload.pem</filename>. + </para></listitem> + </varlistentry> + + <varlistentry> + <term><option>--trust=</option></term> + + <listitem><para> + Takes a path to a SSL CA certificate file in PEM format, + or <option>all</option>. If <option>all</option> is set, + then certificate checking will be disabled. + Defaults to <filename>&CERTIFICATE_ROOT;/ca/trusted.pem</filename>. + </para></listitem> + </varlistentry> + <xi:include href="standard-options.xml" xpointer="help" /> <xi:include href="standard-options.xml" xpointer="version" /> </variablelist> |