man page: do maintenance

- add missing CLI options
- keep consistent order of options (also with --help output)

diff --git a/daemon/daemon.mk b/daemon/daemon.mk
index ac692f7754228d19459bcaa8481fa067f78572bb..ed5a10288a833c584d29e9d90b0299700ea62410 100644 (file)
--- a/daemon/daemon.mk
+++ b/daemon/daemon.mk
@@ -51,7 +51,9 @@ date := $(shell date +%F -r NEWS)
 daemon: $(kresd) $(kresd_DIST)
 daemon-install: kresd-install bindings-install
 ifneq ($(SED),)
-       $(SED) -e "s/@VERSION@/$(VERSION)/" -e "s/@DATE@/$(date)/" doc/kresd.8.in > doc/kresd.8
+       $(SED) -e "s/@VERSION@/$(VERSION)/" -e "s/@DATE@/$(date)/" \
+               -e "s|@MODULEDIR@|$(MODULEDIR)|" \
+               doc/kresd.8.in > doc/kresd.8
        $(INSTALL) -d -m 0755 $(DESTDIR)$(MANDIR)/man8/
        $(INSTALL) -m 0644 doc/kresd.8 $(DESTDIR)$(MANDIR)/man8/
 endif

diff --git a/doc/kresd.8.in b/doc/kresd.8.in
index a54a2623299df99fb738177ff02731451b4242f0..a1be6e24e0d81e0adebaec7e497549fb4d529d90 100644 (file)
--- a/doc/kresd.8.in
+++ b/doc/kresd.8.in
@@ -14,12 +14,18 @@
 .B kresd
 .RB [ \-a | \-\-addr
 .IR addr[@port] ]
+.RB [ \-t | \-\-tls
+.IR addr[@port] ]
 .RB [ \-S | \-\-fd
 .IR fd ]
+.RB [ \-T | \-\-tlsfd
+.IR fd ]
 .RB [ \-c | \-\-config
 .IR config ]
 .RB [ \-k | \-\-keyfile
 .IR keyfile ]
+.RB [ \-m | \-\-moduledir
+.IR path ]
 .RB [ \-f | \-\-forks
 .IR N ]
 .RB [ \-q | \-\-quiet ]
@@ -109,12 +115,20 @@ Option may be passed multiple times to listen on more file descriptors.
 Listen using TLS on given file descriptor(s), passed by supervisor.
 Option may be passed multiple times to listen on more file descriptors.
 .TP
+.B \-c\fI config\fR, \fB\-\-config=\fI<config>
+Set the config file with settings for kresd to read instead of reading the
+file at the default location (\fIconfig\fR). The syntax is
+described in \fIdaemon/README.md\fR.
+.TP
 .B \-k\fI keyfile\fR, \fB\-\-keyfile=\fI<keyfile>
 Use given for keeping root trust anchors. If the file doesn't exist, it will be
 automatically boostrapped from IANA and warning for you will be issued to check it
 before trusting it. The file contains DNSKEY/DS records in presentation format,
 and is compatible with Unbound or BIND9 root key files.
 .TP
+.B \-m\fI path\fR, \fB\-\-moduledir=\fI<path>
+Override the directory that is searched for modules.  Default: @MODULEDIR@
+.TP
 .B \-f\fI N\fR, \fB\-\-forks=\fI<N>
 With this option, the daemon is started in non-interactive mode and instead creates a
 UNIX socket in \fIrundir\fR that the operator can connect to for interactive session.
@@ -132,13 +146,8 @@ Daemon will refrain from printing any informative messages, not even a prompt.
 Increase verbosity. If given multiple times, more information is logged.
 This is in addition to the verbosity (if any) from the config file.
 .TP
-.B \-c\fI config\fR, \fB\-\-config=\fI<config>
-Set the config file with settings for kresd to read instead of reading the
-file at the default location (\fIconfig\fR). The syntax is
-described in \fIdaemon/README.md\fR.
-.TP
 .B \-h
-Show the version and commandline option help.
+Show short commandline option help.
 .TP
 .B \-V
 Show the version.