X-Git-Url: http://www.git.cypherpunks.ru/?a=blobdiff_plain;f=doc%2Fadmin.texi;h=47e0e3e1c0a9ac8812bb805e92660657bef0b5b3;hb=bb7fe5e770586be9f44a8a7f3321a3139d5345bb;hp=7c8420230db141c3bd3ea794d6ed2cd026f99a0f;hpb=745d9fafe84b0745b84d93900722216dde6b88cc;p=nncp.git

diff --git a/doc/admin.texi b/doc/admin.texi
index 7c84202..47e0e3e 100644
--- a/doc/admin.texi
+++ b/doc/admin.texi
@@ -1,4 +1,5 @@
 @node Administration
+@cindex administration
 @unnumbered Administration
 
 NNCP uses following files/directories you should be aware of:
@@ -20,11 +21,18 @@ NNCP uses following files/directories you should be aware of:
     Partly transferred files are stored with @file{.part} suffix. And
     possibly they also require cleanup if they are completely lost.
 
-    Also it can contain @file{.seen} files, that should be cleaned too
-    from time to time.
+    It can contain @file{.nock} files: fully downloaded, but still not
+    checksummed. Can be checksummed (with @file{.nock} extension removing)
+    with @command{@ref{nncp-check} -nock}.
 
-    All of that cleaning tasks can be done with @ref{nncp-rm} utility.
+    Also it can contain @file{seen/} and @file{hdr/} subdirectories,
+    that should be cleaned too from time to time.
 
+    All of that cleaning tasks can be done with @command{@ref{nncp-rm}} utility.
+
+    @cindex shared spool
+    @cindex setgid
+    @pindex umask
     @anchor{Shared spool}
     If you want to share single spool directory with multiple grouped
     Unix users, then you can @command{setgid} it and assure that umask
@@ -43,6 +51,7 @@ $ echo 'umask: "007"' >> /usr/local/etc/nncp.hjson
     @ref{Log} file, for example @file{/var/spool/nncp/log}. It should be
     rotated. Choose you own preferable way to do it.
 
+    @pindex newsyslog
     Example @url{https://www.newsyslog.org/manual.html, newsyslog}'s entry:
 @example
 /var/spool/nncp/log		644	7	100	*	BCYN
@@ -50,18 +59,22 @@ $ echo 'umask: "007"' >> /usr/local/etc/nncp.hjson
 
 @item
     Optional @ref{CfgIncoming, incoming} directories where uploaded
-    files are stored. Probably you want to run @ref{nncp-reass} from
-    time to time to reassemble all chunked uploads. Example crontab
+    files are stored. Probably you want to run @command{@ref{nncp-reass}}
+    from time to time to reassemble all chunked uploads. Example crontab
     entry:
 
 @example
 */1	*	*	*	*	nncp-reass -all -noprogress
 @end example
 
+@pindex daemontools
+@pindex supervise
+@pindex multilog
 @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.
+    Possibly long running @command{@ref{nncp-daemon}},
+    @command{@ref{nncp-caller}}, @command{@ref{nncp-toss}},
+    @command{@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
@@ -86,17 +99,21 @@ EOF
 # mv /var/service/.nncp-toss /var/service/nncp-toss
 @end example
 
+@pindex inetd
 @item
-    @ref{nncp-daemon} can also be run as
+    @command{@ref{nncp-daemon}} can also be run as
     @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
 
+@cindex UCSPI
+@pindex tcpserver
 @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
@@ -104,13 +121,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