From 825d40b7ccdde8b4b9a5299d6e6747c80b9519e2 Mon Sep 17 00:00:00 2001 From: Chris Morgan Date: Sat, 21 Mar 2015 20:47:46 -0400 Subject: [PATCH] man: add journal-remote.conf(5) (cherry picked from commit eaa5251d9167027275d8275862e23e0b7dc8866e) Cherry-picked from: 90d2614 Resolves: #1222517 --- Makefile-man.am | 7 +++ man/journal-remote.conf.xml | 114 +++++++++++++++++++++++++++++++++++++++++ man/systemd-journal-remote.xml | 1 + 3 files changed, 122 insertions(+) create mode 100644 man/journal-remote.conf.xml diff --git a/Makefile-man.am b/Makefile-man.am index ac6f69af7..084df754a 100644 --- a/Makefile-man.am +++ b/Makefile-man.am @@ -1358,14 +1358,20 @@ endif if HAVE_MICROHTTPD MANPAGES += \ + man/journal-remote.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/systemd-journal-gatewayd.8 \ man/systemd-journal-gatewayd.socket.8 +man/journal-remote.conf.d.5: man/journal-remote.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/systemd-journal-gatewayd.html: man/systemd-journal-gatewayd.service.html $(html-alias) @@ -1662,6 +1668,7 @@ EXTRA_DIST += \ man/hostname.xml \ man/hostnamectl.xml \ man/hwdb.xml \ + man/journal-remote.conf.xml \ man/journalctl.xml \ man/journald.conf.xml \ man/kernel-command-line.xml \ diff --git a/man/journal-remote.conf.xml b/man/journal-remote.conf.xml new file mode 100644 index 000000000..a7b222718 --- /dev/null +++ b/man/journal-remote.conf.xml @@ -0,0 +1,114 @@ + + + + + + + + journal-remote.conf + systemd + + + + Developer + Chris + Morgan + chmorgan@gmail.com + + + + + + journal-remote.conf + 5 + + + + journal-remote.conf + journal-remote.conf.d + Journal remote service configuration files + + + + /etc/systemd/journal-remote.conf + /etc/systemd/journald.conf.d/*.conf + /run/systemd/journald.conf.d/*.conf + /usr/lib/systemd/journald.conf.d/*.conf + + + + Description + + These files configure various parameters of the systemd-remote-journal + application, + systemd-journal-remote8. + + + + + + Options + + All options are configured in the + [Remote] section: + + + + + SplitMode= + + One of host or none. + + + + + ServerKeyFile= + + SSL key in PEM format + + + + ServerCertificateFile= + + SSL CA certificate in PEM format. + + + + TrustedCertificateFile= + + SSL CA certificate. + + + + + + + + See Also + + systemd-journal-remote1, + systemd1, + systemd-journald.service8 + + + + diff --git a/man/systemd-journal-remote.xml b/man/systemd-journal-remote.xml index 2687662a1..d5bda635c 100644 --- a/man/systemd-journal-remote.xml +++ b/man/systemd-journal-remote.xml @@ -310,6 +310,7 @@ systemd-journal-remote --url http://some.host:19531/ journalctl1, systemd-journald.service8, systemd-journal-gatewayd.service8 + journal-remote.conf5