INN commit: trunk (3 files)
INN Commit
Russ_Allbery at isc.org
Fri Sep 14 22:08:45 UTC 2007
Date: Friday, September 14, 2007 @ 15:08:45
Author: iulius
Revision: 7671
* Add stathist, tlscafile, tlscapath, tlscertfile and tlskeyfile entries
to the inn.conf sample.
* Little alphabetical reorganization of the inn.conf sample.
* Change the default value of tlskeyfile (key.pem instead of cert.pem
since it is what "make cert" generates).
* Add an innconf->pathcontrol default value in the innconf structure.
* Fix typos.
* There is no longer a newsrequeue program.
* NNTP draft (15) gave birth to NNTP RFC 3977.
Modified:
trunk/doc/pod/inn.conf.pod
trunk/lib/innconf.c
trunk/samples/inn.conf.in
----------------------+
doc/pod/inn.conf.pod | 5 ++---
lib/innconf.c | 19 +++++++++----------
samples/inn.conf.in | 13 +++++++++----
3 files changed, 20 insertions(+), 17 deletions(-)
Modified: doc/pod/inn.conf.pod
===================================================================
--- doc/pod/inn.conf.pod 2007-09-05 14:01:32 UTC (rev 7670)
+++ doc/pod/inn.conf.pod 2007-09-14 22:08:45 UTC (rev 7671)
@@ -643,7 +643,7 @@
the same file (if, for example, you gave the same file name to both the
B<-out> and B<-keyout> options to C<openssl req>). This parameter is only
used if nnrpd is built with TLS support. The default value is
-I<pathnews>/lib/cert.pem.
+I<pathnews>/lib/key.pem.
This file must only be readable by the news user or nnrpd will refuse to
use it.
@@ -989,8 +989,7 @@
Whether the names of the sites to which accepted articles will be sent
should be put into the article log file. This is useful for debugging and
-statistics and can be used by newsrequeue(8). This is a boolean value and
-the default is true.
+statistics. This is a boolean value and the default is true.
=item I<logstatus>
Modified: lib/innconf.c
===================================================================
--- lib/innconf.c 2007-09-05 14:01:32 UTC (rev 7670)
+++ lib/innconf.c 2007-09-14 22:08:45 UTC (rev 7671)
@@ -73,7 +73,7 @@
/* Special notes:
- checkincludedtext and localmaxartisize are used by both nnrpd and inews,
+ checkincludedtext and localmaxartsize are used by both nnrpd and inews,
but inews should probably just let nnrpd do that checking.
organization is used by both nnrpd and inews. Perhaps inews should just
@@ -93,9 +93,6 @@
doinnwatch and docnfsstat are used by rc.news currently, but really
should be grouped with the appropriate subsystem.
- newsrequeue also uses nntplinklog, but the parameter should go away
- completely anyway.
-
timer is currently used in various places, but it may be best to replace
it with individual settings for innd and innfeed, and any other code that
wants to use it.
@@ -214,8 +211,8 @@
#ifdef HAVE_SSL
{ K(tlscafile), STRING ("") },
{ K(tlscapath), STRING ("") },
- { K(tlscertfile), STRING ("") },
- { K(tlskeyfile), STRING ("") },
+ { K(tlscertfile), STRING (NULL) },
+ { K(tlskeyfile), STRING (NULL) },
#endif /* HAVE_SSL */
/* The following settings are used by nnrpd and rnews. */
@@ -315,6 +312,8 @@
pathnews, which is required to be set by innconf_validate. */
if (innconf->pathbin == NULL)
innconf->pathbin = concatpath(innconf->pathnews, "bin");
+ if (innconf->pathcontrol == NULL)
+ innconf->pathcontrol = concatpath(innconf->pathbin, "control");
if (innconf->pathfilter == NULL)
innconf->pathfilter = concatpath(innconf->pathbin, "filter");
if (innconf->pathdb == NULL)
@@ -349,7 +348,7 @@
if (innconf->tlscertfile == NULL)
innconf->tlscertfile = concatpath(innconf->pathnews, "lib/cert.pem");
if (innconf->tlskeyfile == NULL)
- innconf->tlskeyfile = concatpath(innconf->pathnews, "lib/cert.pem");
+ innconf->tlskeyfile = concatpath(innconf->pathnews, "lib/key.pem");
#endif
}
@@ -526,11 +525,11 @@
/* Check and warn about a few other parameters. */
if (innconf->peertimeout < 3 * 60)
config_error_param(group, "peertimeout",
- "warning: NNTP draft (15) states inactivity"
+ "warning: NNTP RFC 3977 states inactivity"
" timeouts MUST be at least three minutes");
if (innconf->clienttimeout < 3 * 60)
config_error_param(group, "clienttimeout",
- "warning: NNTP draft (15) states inactivity"
+ "warning: NNTP RFC 3977 states inactivity"
" timeouts MUST be at least three minutes");
/* All done. Free the parse tree and return. */
@@ -675,7 +674,7 @@
/*
-** Print a single paramter to the given file. Takes an index into the table
+** Print a single parameter to the given file. Take an index into the table
** specifying the attribute to print and the quoting.
*/
static void
Modified: samples/inn.conf.in
===================================================================
--- samples/inn.conf.in 2007-09-05 14:01:32 UTC (rev 7670)
+++ samples/inn.conf.in 2007-09-14 22:08:45 UTC (rev 7671)
@@ -61,13 +61,13 @@
enableoverview: true
groupbaseexpiry: true
mergetogroups: false
+nfswriter: false
overcachesize: 15
#ovgrouppat:
storeonxref: true
useoverchan: false
wireformat: false
xrefslave: false
-nfswriter: false
# Reading
@@ -76,14 +76,18 @@
clienttimeout: 600
initialtimeout: 10
msgidcachesize: 10000
+nfsreader: false
+nfsreaderdelay: 60
nnrpdcheckart: true
+nnrpdloadlimit: 16
noreader: false
readerswhenstopped: false
readertrack: false
-nfsreader: false
-nfsreaderdelay: 60
+#tlscafile:
+#tlscapath:
+#tlscertfile: @libdir@/cert.pem
+#tlskeyfile: @libdir@/key.pem
tradindexedmmap: true
-nnrpdloadlimit: 16
# Reading -- Keyword Support
#
@@ -144,6 +148,7 @@
nnrpdoverstats: false
nntpactsync: 200
nntplinklog: false
+#stathist:
status: 0
timer: 0
More information about the inn-committers
mailing list