X-Git-Url: http://www.git.cypherpunks.ru/?a=blobdiff_plain;f=doc%2Fadmin.texi;h=86caeb9264f0c76ff5293845f97c51639e7d5966;hb=2b331a082bb710d1e5a529ed32dcbba0a2e843cb;hp=302ec051e2a57975d80124e81ee10b6204fe0e9f;hpb=3fd8e2f54430f155cb58ec5fe73df4b25ead312e;p=nncp.git

diff --git a/doc/admin.texi b/doc/admin.texi
index 302ec05..86caeb9 100644
--- a/doc/admin.texi
+++ b/doc/admin.texi
@@ -22,7 +22,7 @@ NNCP uses following files/directories you should be aware of:
 
     It can contain @file{.nock} files: fully downloaded, but still not
     checksummed. Can be checksummed (with @file{.nock} extension removing)
-    with @ref{nncp-check -nock}.
+    with @command{nncp-check -nock}.
 
     Also it can contain @file{.seen} files, that should be cleaned too
     from time to time.
@@ -64,8 +64,8 @@ $ echo 'umask: "007"' >> /usr/local/etc/nncp.hjson
 
 @item
     Possibly long running @ref{nncp-daemon}, @ref{nncp-caller},
-    @ref{nncp-toss} daemons. As all software, they can fail and you
-    should place them under some supervisor control.
+    @ref{nncp-toss}, @ref{nncp-check} daemons. As all software, they can
+    fail and you should place them under some supervisor control.
 
     For example you can use @url{http://cr.yp.to/daemontools.html,
     daemontools} for that task to run them under probably existing
@@ -95,12 +95,13 @@ EOF
     @url{https://en.wikipedia.org/wiki/Inetd, inetd} service on UUCP's port:
 
 @example
-uucp	stream	tcp6	nowait	nncpuser	/usr/local/bin/nncp-daemon	nncp-daemon -quiet -inetd
+uucp	stream	tcp6	nowait	nncpuser	/usr/local/bin/nncp-daemon	nncp-daemon -quiet -ucspi
 @end example
 
 @item
     Or it can be also run as a @command{daemontools} daemon under
-    @url{http://cr.yp.to/ucspi-tcp.html, UCSPI-TCP}:
+    @url{http://cr.yp.to/ucspi-tcp.html, UCSPI-TCP}. In the example
+    below it uses native daemontools's logging capability:
 
 @example
 # mkdir -p /var/service/.nncp-daemon/log
@@ -108,13 +109,13 @@ uucp	stream	tcp6	nowait	nncpuser	/usr/local/bin/nncp-daemon	nncp-daemon -quiet -
 
 # cat > run <<EOF
 #!/bin/sh -e
-exec envuidgid nncpuser tcpserver -DRHU -l 0 0 uucp \
-	/usr/local/bin/nncp-daemon -quiet -inetd
+NNCPLOG=FD:4 exec envuidgid nncpuser tcpserver -DHRU -l 0 ::0 uucp \
+	/usr/local/bin/nncp-daemon -quiet -ucspi 4>&1
 EOF
 
 # cat > log/run <<EOF
 #!/bin/sh -e
-exec setuidgid uucp multilog t ./main
+exec setuidgid uucp multilog ./main
 EOF
 
 # chmod -R 755 /var/service/.nncp-daemon