From 1f416853b6d7e2c603367737aa643e8d485b2ccc Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Tue, 8 May 2018 10:14:02 +0900 Subject: [PATCH 1/4] man: update references to systemd-journal-{remote,upload} Fixes #8920 and #8921. --- man/journal-remote.conf.xml | 2 +- man/journal-upload.conf.xml | 2 +- man/journalctl.xml | 4 ++-- man/rules/meson.build | 10 ++++++++-- ....xml => systemd-journal-remote.service.xml} | 18 +++++++++++------- ....xml => systemd-journal-upload.service.xml} | 10 ++++++---- 6 files changed, 29 insertions(+), 17 deletions(-) rename man/{systemd-journal-remote.xml => systemd-journal-remote.service.xml} (95%) rename man/{systemd-journal-upload.xml => systemd-journal-upload.service.xml} (96%) diff --git a/man/journal-remote.conf.xml b/man/journal-remote.conf.xml index db5e4efd5b2..2ab5b1df232 100644 --- a/man/journal-remote.conf.xml +++ b/man/journal-remote.conf.xml @@ -102,7 +102,7 @@ See Also - systemd-journal-remote8, + systemd-journal-remote.service8, systemd1, systemd-journald.service8 diff --git a/man/journal-upload.conf.xml b/man/journal-upload.conf.xml index 8e241370db0..9d486d9801c 100644 --- a/man/journal-upload.conf.xml +++ b/man/journal-upload.conf.xml @@ -96,7 +96,7 @@ See Also - systemd-journal-upload8, + systemd-journal-upload.service8, systemd1, systemd-journald.service8 diff --git a/man/journalctl.xml b/man/journalctl.xml index 1bec2b79fb5..12d6a80c573 100644 --- a/man/journalctl.xml +++ b/man/journalctl.xml @@ -976,8 +976,8 @@ journalctl _SYSTEMD_CGROUP=/user.slice/user-42.slice/session-c1.scopesystemd.journal-fields7, journald.conf5, systemd.time7, - systemd-journal-remote8, - systemd-journal-upload8 + systemd-journal-remote.service8, + systemd-journal-upload.service8 diff --git a/man/rules/meson.build b/man/rules/meson.build index 6b07cfc4feb..e9759f16a15 100644 --- a/man/rules/meson.build +++ b/man/rules/meson.build @@ -574,8 +574,14 @@ manpages = [ '8', ['systemd-journal-gatewayd', 'systemd-journal-gatewayd.socket'], 'HAVE_MICROHTTPD'], - ['systemd-journal-remote', '8', [], 'HAVE_MICROHTTPD'], - ['systemd-journal-upload', '8', [], 'HAVE_MICROHTTPD'], + ['systemd-journal-remote.service', + '8', + ['systemd-journal-remote', 'systemd-journal-remote.socket'], + 'HAVE_MICROHTTPD'], + ['systemd-journal-upload.service', + '8', + ['systemd-journal-upload'], + 'HAVE_MICROHTTPD'], ['systemd-journald.service', '8', ['systemd-journald', diff --git a/man/systemd-journal-remote.xml b/man/systemd-journal-remote.service.xml similarity index 95% rename from man/systemd-journal-remote.xml rename to man/systemd-journal-remote.service.xml index 17014953579..7f93f9fe7b2 100644 --- a/man/systemd-journal-remote.xml +++ b/man/systemd-journal-remote.service.xml @@ -17,7 +17,7 @@ xmlns:xi="http://www.w3.org/2001/XInclude"> - systemd-journal-remote + systemd-journal-remote.service systemd @@ -31,18 +31,22 @@ - systemd-journal-remote + systemd-journal-remote.service 8 + systemd-journal-remote.service + systemd-journal-remote.socket systemd-journal-remote Receive journal messages over the network + systemd-journal-remote.service + systemd-journal-remote.socket - systemd-journal-remote + /usr/lib/systemd/systemd-journal-remote OPTIONS -o/--output=DIR|FILE SOURCES @@ -351,11 +355,11 @@ systemd-journal-remote --url http://some.host:19531/entries?boot&follow See Also - systemd-journal-upload8, + journal-remote.conf5, journalctl1, - systemd-journald.service8, - systemd-journal-gatewayd.service8 - journal-remote.conf5 + systemd-journal-gatewayd.service8, + systemd-journal-upload.service8, + systemd-journald.service8 diff --git a/man/systemd-journal-upload.xml b/man/systemd-journal-upload.service.xml similarity index 96% rename from man/systemd-journal-upload.xml rename to man/systemd-journal-upload.service.xml index 900706a34d6..7ead23ed608 100644 --- a/man/systemd-journal-upload.xml +++ b/man/systemd-journal-upload.service.xml @@ -17,7 +17,7 @@ xmlns:xi="http://www.w3.org/2001/XInclude"> - systemd-journal-upload + systemd-journal-upload.service systemd @@ -31,18 +31,20 @@ - systemd-journal-upload + systemd-journal-upload.service 8 + systemd-journal-upload.service systemd-journal-upload Send journal messages over the network + systemd-journal-upload.service - systemd-journal-upload + /usr/lib/systemd/systemd-journal-upload OPTIONS -u/--url=URL SOURCES @@ -281,7 +283,7 @@ openssl ca -batch -config ca.conf -notext -in $CLIENT.csr -out $CLIENT.pem See Also - systemd-journal-remote8, + systemd-journal-remote.service8, journalctl1, systemd-journald.service8, systemd-journal-gatewayd.service8 From 691bba5987b4ed5bdfb84eb566e6e099cb19215f Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Tue, 8 May 2018 11:57:28 +0900 Subject: [PATCH 2/4] man: mention the default port number of journal-remote --- man/systemd-journal-remote.service.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/man/systemd-journal-remote.service.xml b/man/systemd-journal-remote.service.xml index 7f93f9fe7b2..acaf61c39f1 100644 --- a/man/systemd-journal-remote.service.xml +++ b/man/systemd-journal-remote.service.xml @@ -163,8 +163,8 @@ interpreted as the (negated) file descriptor number, or an address suitable for (c.f. systemd.socket5). - In the first case, matching file descriptor must be inherited - through + In the first case, the server listens on port 19532 by default, + and the matching file descriptor must be inherited through $LISTEN_FDS/$LISTEN_PID. In the second case, an HTTP or HTTPS server will be spawned on this port, respectively for and From 767f565fc36c3084a6659e08852b71ab549c4ddb Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Tue, 8 May 2018 11:58:16 +0900 Subject: [PATCH 3/4] man: mention that --url option of journal-upload can specify the port number --- man/systemd-journal-upload.service.xml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/man/systemd-journal-upload.service.xml b/man/systemd-journal-upload.service.xml index 7ead23ed608..141e595400d 100644 --- a/man/systemd-journal-upload.service.xml +++ b/man/systemd-journal-upload.service.xml @@ -69,13 +69,15 @@ - - + + Upload to the specified address. URL may specify either just the hostname or both the protocol and hostname. https is the default. + The port number may be specified after a colon (:), + otherwise 19532 will be used by default. From 5efc15d6e98c290ad9a3512c4919db31dcd8afea Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Tue, 8 May 2018 12:41:59 +0900 Subject: [PATCH 4/4] man: fix typo --- man/journal-remote.conf.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/man/journal-remote.conf.xml b/man/journal-remote.conf.xml index 2ab5b1df232..42ecabc8074 100644 --- a/man/journal-remote.conf.xml +++ b/man/journal-remote.conf.xml @@ -86,7 +86,7 @@ ServerCertificateFile= - SSL CA certificate in PEM format. + SSL certificate in PEM format.