INN commit: trunk (10 files)
INN Commit
Russ_Allbery at isc.org
Tue Aug 14 18:52:32 UTC 2007
Date: Tuesday, August 14, 2007 @ 11:52:32
Author: iulius
Revision: 7647
Improve some samples (especially documentation inside).
buffindex.conf has now a correct path to overview.
Fix the sample cycbuff name whose length was higher than
8 characters.
Added:
trunk/samples/buffindexed.conf.in
(from rev 7641, trunk/samples/buffindexed.conf)
Modified:
trunk/MANIFEST
trunk/samples/ (properties)
trunk/samples/Makefile
trunk/samples/actsync.cfg
trunk/samples/actsync.ign
trunk/samples/cycbuff.conf
trunk/samples/storage.conf
trunk/support/mkmanifest
Deleted:
trunk/samples/buffindexed.conf
-----------------------------+
MANIFEST | 2 -
samples/Makefile | 5 ++-
samples/actsync.cfg | 7 ++++
samples/actsync.ign | 24 +++++++---------
samples/buffindexed.conf | 11 -------
samples/buffindexed.conf.in | 17 +++++++++++
samples/cycbuff.conf | 62 +++++++++++++++++++++++++++++-------------
samples/storage.conf | 11 +++++--
support/mkmanifest | 1
9 files changed, 90 insertions(+), 50 deletions(-)
Modified: MANIFEST
===================================================================
--- MANIFEST 2007-08-14 18:49:27 UTC (rev 7646)
+++ MANIFEST 2007-08-14 18:52:32 UTC (rev 7647)
@@ -600,7 +600,7 @@
samples/active.minimal Minimal starting active file
samples/actsync.cfg Config file for actsync
samples/actsync.ign Ignore file for actsync
-samples/buffindexed.conf Buffindexed overview config file
+samples/buffindexed.conf.in Buffindexed overview config file
samples/control.ctl Access control for control messages
samples/cycbuff.conf Sample cycbuff.conf file
samples/distrib.pats Default values for Distribution header
Property changes on: trunk/samples
___________________________________________________________________
Name: svn:ignore
- inn.conf
innreport.conf
newsfeeds
nnrpd_access.pl
nnrpd_access_wrapper.pl
nnrpd_auth.pl
nnrpd_auth_wrapper.pl
sasl.conf
+ buffindexed.conf
inn.conf
innreport.conf
newsfeeds
nnrpd_access.pl
nnrpd_access_wrapper.pl
nnrpd_auth.pl
nnrpd_auth_wrapper.pl
sasl.conf
Modified: samples/Makefile
===================================================================
--- samples/Makefile 2007-08-14 18:49:27 UTC (rev 7646)
+++ samples/Makefile 2007-08-14 18:52:32 UTC (rev 7647)
@@ -11,8 +11,8 @@
top = ..
-ALL = inn.conf innreport.conf newsfeeds nnrpd_auth.pl \
- nnrpd_access.pl nnrpd_auth_wrapper.pl \
+ALL = buffindexed.conf inn.conf innreport.conf newsfeeds \
+ nnrpd_auth.pl nnrpd_access.pl nnrpd_auth_wrapper.pl \
nnrpd_access_wrapper.pl
all: $(ALL)
@@ -37,6 +37,7 @@
FIXC = $(FIXCONFIG)
FIXS = $(FIXSCRIPT)
+buffindexed.conf: buffindexed.conf.in $(FIXC) ; $(FIXC) $@.in
inn.conf: inn.conf.in $(FIXC) ; $(FIXC) $@.in
innreport.conf: innreport.conf.in $(FIXC) ; $(FIXC) $@.in
newsfeeds: newsfeeds.in $(FIXC) ; $(FIXC) $@.in
Modified: samples/actsync.cfg
===================================================================
--- samples/actsync.cfg 2007-08-14 18:49:27 UTC (rev 7646)
+++ samples/actsync.cfg 2007-08-14 18:52:32 UTC (rev 7647)
@@ -1,4 +1,9 @@
-# $Id$
+## $Id$
+##
+## Sample actsync configuration file.
+##
+## It permits to synchronize, compare, or merge active files.
+## See the actsync manpage for more information.
host=ftp.isc.org
ftppath=/pub/usenet/CONFIG/active.gz
Modified: samples/actsync.ign
===================================================================
--- samples/actsync.ign 2007-08-14 18:49:27 UTC (rev 7646)
+++ samples/actsync.ign 2007-08-14 18:52:32 UTC (rev 7647)
@@ -1,13 +1,14 @@
-# $Id$
-#
-# Sample actsync ignore_file.
+## $Id$
+##
+## Sample actsync ignore_file.
+##
+## It defines synchronization rules.
+## See the actsync manpage for more information.
-# For now by default do not sync
-#
+## For now by default do not sync.
i *
-# sync on the 8 majors
-#
+## Sync on the 8 majors.
c comp.*
c humanities.*
c misc.*
@@ -17,16 +18,13 @@
c soc.*
c talk.*
-# sync only moderated gnu.* groups
-#
+## Sync only moderated gnu.* groups.
#c gnu.* m
-# don't compare to.* groups as they will differ
-#
+## Don't compare to.* groups as they will differ.
i to.*
-# we always want our special top level groups
-#
+## We always want our special top level groups.
i control
i general
i junk
Deleted: samples/buffindexed.conf
===================================================================
--- samples/buffindexed.conf 2007-08-14 18:49:27 UTC (rev 7646)
+++ samples/buffindexed.conf 2007-08-14 18:52:32 UTC (rev 7647)
@@ -1,11 +0,0 @@
-#
-# overview buffer configuration file
-#
-# The order in this items appear in this file is not important
-
-# Format:
-# index(0-65535) : path to buffer file :
-# length of buffer in kilobytes in decimal (1KB = 1024 bytes)
-
-0:/var/news/spool/overview/OV1:1536000
-1:/var/news/spool/overview/OV2:1536000
Copied: trunk/samples/buffindexed.conf.in (from rev 7641, trunk/samples/buffindexed.conf)
===================================================================
--- samples/buffindexed.conf.in (rev 0)
+++ samples/buffindexed.conf.in 2007-08-14 18:52:32 UTC (rev 7647)
@@ -0,0 +1,17 @@
+## $Id$
+##
+## Configuration for the buffindexed overview method.
+##
+## It specifies the buffers that the buffindexed overview method
+## should use. It is required if the server uses buffindexed (as
+## configured by the ovmethod: parameter in inn.conf).
+## See the buffindexed.conf manpage for more information.
+##
+## The order of lines in this file is not important.
+
+## Format:
+## index(0-65535) : path to buffer file :
+## length of buffer in kilobytes in decimal (1KB = 1024 bytes)
+
+0:@SPOOLDIR@/overview/OV1:1536000
+1:@SPOOLDIR@/overview/OV2:1536000
Modified: samples/cycbuff.conf
===================================================================
--- samples/cycbuff.conf 2007-08-14 18:49:27 UTC (rev 7646)
+++ samples/cycbuff.conf 2007-08-14 18:52:32 UTC (rev 7647)
@@ -1,26 +1,50 @@
-#
-# Meta cnfs cyclic buffer configuration file (and assignments of newsgroups to
-# metacyclic buffers)
-#
-# The order of lines in this file is not important among the same item.
-# But all cycbuff item should be presented before any metacycbuff item.
+## $Id$
+##
+## Configuration file for INN CNFS storage method.
+##
+## This file defines the cyclical buffers that make up the storage pools
+## for CNFS (Cyclic News File System). For information about how to
+## configure INN to use CNFS, see the storage.conf manpage; and for
+## information about how to create the CNFS buffers, see the cycbuff.conf
+## manpage.
+##
+## The order of lines in this file is not important among the same item.
+## But all cycbuff item should be presented before any metacycbuff item.
-# 1. Cyclic buffers
-# Format:
-# "cycbuff" (literally) : symbolic buffer name : path to buffer file :
-# length of symbolic buffer in kilobytes in decimal (1KB = 1024 bytes)
+## Number of articles written before the cycbuff header is
+## written back to disk to (25 by default).
+cycbuffupdate:25
+
+## Interval (in seconds) between re-reads of the cycbuff (30 by default).
+
+refreshinterval:30
+
+## 1. Cyclic buffers
+## Format:
+## "cycbuff" (literally) : symbolic buffer name (less than 7 characters) :
+## path to buffer file : length of symbolic buffer in kilobytes in decimal
+## (1KB = 1024 bytes)
+##
+## If you're trying to stay under 2 GB, keep your sizes below 2097152.
+
cycbuff:ONE:/export/cycbuffs/one:512000
cycbuff:TWO:/export/cycbuffs/two:512000
cycbuff:THREE:/export/cycbuffs/three:512000
-# 2. Meta-cyclic buffers
-# Format:
-# "metacycbuff" (literally) : symbolic meta-cyclic buffer name :
-# comma separated list of cyclic buffer symbolic names
-#
-# symbolic meta-cyclic buffer names are used in storage.conf in the
-# options field
+## 2. Meta-cyclic buffers
+## Format:
+## "metacycbuff" (literally) : symbolic meta-cyclic buffer name (less than
+## 8 characters) : comma separated list of cyclic buffer symbolic names
+## [:INTERLEAVE|SEQUENTIAL]
+##
+## With the default INTERLEAVE mode, articles are stored in each cycbuff
+## in a round-robin fashion, one article per cycbuff in the order listed.
+## With the SEQUENTIAL mode, each cycbuff is written in turn until that
+## cycbuff is full and then moves on to the next one.
+##
+## Symbolic meta-cyclic buffer names are used in storage.conf in the
+## options: field.
-metacycbuff:BIGAREA:ONE,TWO
-metacycbuff:SMALLAREA:THREE
+metacycbuff:BIG:ONE,TWO:SEQUENTIAL
+metacycbuff:SMALL:THREE
Modified: samples/storage.conf
===================================================================
--- samples/storage.conf 2007-08-14 18:49:27 UTC (rev 7646)
+++ samples/storage.conf 2007-08-14 18:52:32 UTC (rev 7647)
@@ -15,11 +15,14 @@
## exactmatch: <bool>
## }
##
+## See the storage.conf manpage for more information.
+##
## Only newsgroups, class, and (for CNFS, to specify the metacycbuff)
## options are required; the other keys are optional. If any CNFS
## methods are configured, you will also need to set up cycbuff.conf.
-# By default, store everything in tradspool.
+## By default, store everything in tradspool.
+
method tradspool {
newsgroups: *
class: 0
@@ -31,14 +34,16 @@
## stored in the binary metacycbuff as well. This assumes storeonxref is
## set to true in inn.conf.
-# Pick off the binary newsgroups first.
+## Pick off the binary newsgroups first.
+
#method cnfs {
# newsgroups: *.bina*,control.cancel
# class: 1
# options: BINARY
#}
-# Put the remaining (text) groups in the other cycbuff.
+## Put the remaining (text) groups in the other cycbuff.
+
#method cnfs {
# newsgroups: *
# class: 2
Modified: support/mkmanifest
===================================================================
--- support/mkmanifest 2007-08-14 18:49:27 UTC (rev 7646)
+++ support/mkmanifest 2007-08-14 18:52:32 UTC (rev 7647)
@@ -178,6 +178,7 @@
innfeed/procbatch
innfeed/version.c
nnrpd/nnrpd
+samples/buffindexed.conf
samples/inn.conf
samples/innreport.conf
samples/newsfeeds
More information about the inn-committers
mailing list