INN commit: trunk (8 files)
INN Commit
Russ_Allbery at isc.org
Mon Aug 20 10:08:34 UTC 2007
Date: Monday, August 20, 2007 @ 03:08:33
Author: iulius
Revision: 7650
Improve POD documentation for send-uucp(8): fix typos,
mention the same Tf,Wnb flags as newsfeeds does (and
mention send-uucp in the newsfeeds sample), bzip2 is now
usable, fix an error in the batch hours in the example,
maxsize should not be '500,000' but '500000'.
Add a sample configuration send-uucp.cf (based upon the
work of Marco d'Itri).
Added:
trunk/samples/send-uucp.cf
Modified:
trunk/MANIFEST
trunk/backends/send-uucp.in
trunk/samples/Makefile
trunk/samples/newsfeeds.in
trunk/site/ (properties)
trunk/site/Makefile
trunk/support/mkmanifest
-----------------------+
MANIFEST | 1
backends/send-uucp.in | 57 +++++++++++++++++++++++++++---------------------
samples/Makefile | 2 -
samples/newsfeeds.in | 1
samples/send-uucp.cf | 32 ++++++++++++++++++++++++++
site/Makefile | 7 ++++-
support/mkmanifest | 1
7 files changed, 74 insertions(+), 27 deletions(-)
Modified: MANIFEST
===================================================================
--- MANIFEST 2007-08-20 08:42:03 UTC (rev 7649)
+++ MANIFEST 2007-08-20 10:08:33 UTC (rev 7650)
@@ -634,6 +634,7 @@
samples/passwd.nntp Passwords for remote connections
samples/radius.conf Sample config for RADIUS authentication
samples/readers.conf Reader connection configuration
+samples/send-uucp.cf send-uucp configuration file
samples/startup_innd.pl Perl startup code for innd
samples/storage.conf Sample storage configuration
samples/subscriptions Sample default subscriptions list
Modified: backends/send-uucp.in
===================================================================
--- backends/send-uucp.in 2007-08-20 08:42:03 UTC (rev 7649)
+++ backends/send-uucp.in 2007-08-20 10:08:33 UTC (rev 7650)
@@ -2,7 +2,7 @@
# fixscript will replace this line with code to load innshellvars
##############################################################################
-# send-uucp.pl create news batches from the outgoing files
+# send-uucp.pl create and send UUCP news batches from the outgoing files
#
# Author: Edvard Tuinder <ed at elm.net>
#
@@ -260,7 +260,7 @@
=head1 SYNOPSIS
-B<send-uucp> [I<SITE> ...]
+B<send-uucp> [I<site> ...]
=head1 DESCRIPTION
@@ -269,10 +269,14 @@
it behaves with various sites. Normally, it's run periodically out of cron
to put together batches and send them to remote UUCP sites.
+It makes it possible to reduce bandwidth usage and to send news to remote
+UUCP sites which cannot receive a real-time feed (for instance if they
+are over dial-up connections).
+
=head1 OPTIONS
Any arguments provided to the program are interpreted as a list of sites
-specfied in F<send-uucp.cf> for which batches should be generated. If no
+specified in F<send-uucp.cf> for which batches should be generated. If no
arguments are supplied then batches will be generated for all sites listed
in that configuration file.
@@ -306,15 +310,15 @@
=item I<compressor>
-The compression method to use for batches. This should be one of compress,
-gzip or none. Arguments for the compression command may be specified by
-using C<_> instead of spaces. For example, C<gzip_-9>. The default value is
-C<compress>.
+The compression method to use for batches. This should be one of C<bzip2>,
+C<compress>, C<gzip> or C<none>. Arguments for the compression command may be
+specified by using C<_> instead of spaces. For example, C<gzip_-9>.
+The default value is C<compress>.
=item I<maxsize>
-The maximum size of a single batch before compression. The default value is
-500,000 bytes.
+The maximum size in bytes of a single batch I<before> compression. The default
+value is C<500000> bytes.
=item I<batchtime>
@@ -325,51 +329,56 @@
=back
-Fields are seperated by spaces and only the site name needs to be specified,
+Fields are separated by spaces and only the site name needs to be specified,
with defaults being used for unspecified values. If the first character on
-a line is a C<#> then the rest of the line is ignored.
+a line is a hash sign (C<#>) then the rest of the line is ignored.
=head1 EXAMPLE
-Here is an example send-uucp.cf configuration file:
+Here is an example F<send-uucp.cf> configuration file:
zoetermeer gzip 1048576 5,18,22
hoofddorp gzip 1048576 5,18,22
pa3ebv gzip 1048576 5,18,22
- drinkel gzip 1048576 5,6,18,20,22,0,2
+ drinkel bzip2 1048576 5,6,18,20,22,0,2
manhole compress 1048576 5,18,22
owl compress 1048576
able
pern::MYFUNNEL!
-This defines eight UUCP sites. The first four use gzip compression and the
-last three use compress. The first six use a batch size of 1MB, and the
-last site (able) uses the default of 500,000 bytes. The zoetermeer,
-hoofddorp, pa3ebv, and manhole sites will only have batches generated for
-them during the hours of 05:00, 18:00, and 22:00, and the drinkel site will
-only have batches generated during those hours and 20:00, 00:00, and 02:00.
-There are no restrictions on when batches will be generated for owl or able.
+This defines eight UUCP sites. The first three use C<gzip> compression, the
+following site uses C<bzip2> and the last three use C<compress>. The first
+six use a batch size of 1MB, and the last site ("able") uses the default of
+500,000 bytes. The "zoetermeer", "hoofddorp", "pa3ebv", and "manhole" sites
+will only have batches generated for them during the hours of 05:00, 18:00,
+and 22:00, and the "drinkel" site will only have batches generated during those
+hours and 06:00, 20:00, 00:00, and 02:00. There are no restrictions on when
+batches will be generated for "owl" or "able".
-The pern site is configured as a funnel into C<MYFUNNEL!>. B<send-uucp> will
+The "pern" site is configured as a funnel into C<MYFUNNEL!>. B<send-uucp> will
issue C<ctlinnd flush MYFUNNEL!> instead of C<ctlinnd flush pern>.
=head1 FILES
=over 4
+=item I<pathbin>/send-uucp
+
+The Perl script itself used to create news batches from the outgoing files.
+
=item I<pathetc>/send-uucp.cf
-Configuration file specifying a list of sites to be processed.
+Configuration file specifying a list of sites to be processed.
=back
=head1 NOTES
-The usual flags used for a UUCP feed in the I<newsfeeds> file are C<Tf,Wfb>.
+The usual flags used for a UUCP feed in the F<newsfeeds> file are C<Tf,Wnb>.
=head1 SEE ALSO
-innd(8), newsfeeds(5), uucp(8)
+innd(8), newsfeeds(5), uucp(8).
=head1 AUTHOR
Modified: samples/Makefile
===================================================================
--- samples/Makefile 2007-08-20 08:42:03 UTC (rev 7649)
+++ samples/Makefile 2007-08-20 10:08:33 UTC (rev 7650)
@@ -37,7 +37,7 @@
FIXC = $(FIXCONFIG)
FIXS = $(FIXSCRIPT)
-buffindexed.conf: buffindexed.conf.in $(FIXC) ; $(FIXC) $@.in
+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/newsfeeds.in
===================================================================
--- samples/newsfeeds.in 2007-08-20 08:42:03 UTC (rev 7649)
+++ samples/newsfeeds.in 2007-08-20 10:08:33 UTC (rev 7650)
@@ -95,6 +95,7 @@
# :Tf,Wnm:
# A UUCP feed, where we try to keep the "batching" between 4K and 1K.
+# You can use send-uucp(8) to process these batch files.
#ihnp4\
# :*,!junk,!control/!foo\
# :Tf,Wnb,B4096/1024:
Added: samples/send-uucp.cf
===================================================================
--- samples/send-uucp.cf (rev 0)
+++ samples/send-uucp.cf 2007-08-20 10:08:33 UTC (rev 7650)
@@ -0,0 +1,32 @@
+## $Id$
+##
+## Configuration file for send-uucp(8).
+##
+## It specifies to which remote UUCP sites news batches from the outgoing
+## files should be sent.
+##
+## Format:
+## site[:host[:funnel]] [compressor [maxsize [batchtime]]]
+##
+## compressor, maxsize and batchtime can be left out and will then use the
+## default values. You can't leave out the second field (compressor) and
+## still use the third (maxsize) or the fourth (batchtime). So if you want
+## to set a maxsize, you HAVE to add a compression method.
+##
+## compressor values can be one of: "bzip2", "compress", "gzip", "none".
+##
+## You can use flags with your compressor, just add them with a '_' character
+## instead of a space. For example, "compress_-b13" for 13 bits compression.
+##
+## Remember that the size you set is the size *before* compression!
+##
+## See the send-uucp man page for more information.
+
+#zoetermeer gzip 1048576 5,18,22
+#hoofddorp gzip 1048576 5,18,22
+#pa3ebv gzip 1048576 5,18,22
+#drinkel bzip2 1048576 5,6,18,20,22,0,2
+#manhole compress 1048576 5,18,22
+#owl compress 1048576
+#able
+#pern::MYFUNNEL!
Property changes on: trunk/samples/send-uucp.cf
___________________________________________________________________
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ native
Property changes on: trunk/site
___________________________________________________________________
Name: svn:ignore
- INN.py
active.minimal
actsync.cfg
actsync.ign
buffindexed.conf
config
control.ctl
cycbuff.conf
distrib.pats
expire.ctl
filter.tcl
filter_innd.pl
filter_innd.py
filter_nnrpd.pl
incoming.conf
inn.conf
innfeed.conf
innreport.conf
innwatch.ctl
moderators
motd.news
news2mail.cf
newsfeeds
newsgroups.minimal
nnrpd.track
nnrpd_access.pl
nnrpd_auth.pl
nnrpd_auth.py
nntpsend.ctl
ovdb.conf
overview.fmt
passwd.nntp
radius.conf
readers.conf
sasl.conf
startup.tcl
startup_innd.pl
storage.conf
subscriptions
update
+ INN.py
active.minimal
actsync.cfg
actsync.ign
buffindexed.conf
config
control.ctl
cycbuff.conf
distrib.pats
expire.ctl
filter.tcl
filter_innd.pl
filter_innd.py
filter_nnrpd.pl
incoming.conf
inn.conf
innfeed.conf
innreport.conf
innwatch.ctl
moderators
motd.news
news2mail.cf
newsfeeds
newsgroups.minimal
nnrpd.track
nnrpd_access.pl
nnrpd_auth.pl
nnrpd_auth.py
nntpsend.ctl
ovdb.conf
overview.fmt
passwd.nntp
radius.conf
readers.conf
sasl.conf
send-uucp.cf
startup.tcl
startup_innd.pl
storage.conf
subscriptions
update
Modified: site/Makefile
===================================================================
--- site/Makefile 2007-08-20 08:42:03 UTC (rev 7649)
+++ site/Makefile 2007-08-20 10:08:33 UTC (rev 7650)
@@ -43,6 +43,7 @@
PATH_BUFFINDEXED = ${PATHETC}/buffindexed.conf
PATH_RADIUS_CONF = ${PATHETC}/radius.conf
PATH_OVDB_CONF = ${PATHETC}/ovdb.conf
+PATH_SENDUUCP_CF = ${PATHETC}/send-uucp.cf
PATH_SUBSCRIPTIONS = ${PATHETC}/subscriptions
PATH_ACTIVE = ${PATHDB}/active
@@ -62,7 +63,7 @@
nnrpd_auth.pl nnrpd_access.pl \
news2mail.cf readers.conf \
radius.conf nnrpd_auth.py ovdb.conf active.minimal \
- newsgroups.minimal subscriptions
+ newsgroups.minimal send-uucp.cf subscriptions
ALL = $(MOST) $(REST)
@@ -82,7 +83,7 @@
$D$(PATH_TCL_STARTUP) $D$(PATH_TCL_FILTER) \
$D$(PATH_NNRPAUTH) $D$(PATHETC)/news2mail.cf $D$(PATH_READERSCONF) \
$D$(PATH_RADIUS_CONF) $D$(PATH_NNRPYAUTH) $D$(PATH_OVDB_CONF) \
- $D$(PATH_SUBSCRIPTIONS) $D$(PATH_NNRPACCESS)
+ $D$(PATH_SENDUUCP_CF) $D$(PATH_SUBSCRIPTIONS) $D$(PATH_NNRPACCESS)
ALL_INSTALLED = $(MOST_INSTALLED) $(REST_INSTALLED)
@@ -197,6 +198,7 @@
$D$(PATH_ACTSYNC_IGN): actsync.ign ; $(COPY_RPUB) $? $@
$D$(PATH_MOTD): motd.news ; $(COPY_RPUB) $? $@
$D$(PATH_INNFEEDCTL): innfeed.conf ; $(COPY_RPRI) $? $@
+$D$(PATH_SENDUUCP_CF): send-uucp.cf ; $(COPY_RPUB) $? $@
$D$(PATH_SUBSCRIPTIONS): subscriptions ; $(COPY_RPUB) $? $@
REASON = 'Installing site config files from site/Makefile'
@@ -245,6 +247,7 @@
readers.conf: ../samples/readers.conf ; $(COPY) $? $@
radius.conf: ../samples/radius.conf ; $(COPY) $? $@
startup_innd.pl: ../samples/startup_innd.pl ; $(COPY) $? $@
+send-uucp.cf: ../samples/send-uucp.cf ; $(COPY) $? $@
subscriptions: ../samples/subscriptions ; $(COPY) $? $@
active.minimal: ../samples/active.minimal ; $(COPY) $? $@
newsgroups.minimal: ../samples/newsgroups.minimal ; $(COPY) $? $@
Modified: support/mkmanifest
===================================================================
--- support/mkmanifest 2007-08-20 08:42:03 UTC (rev 7649)
+++ support/mkmanifest 2007-08-20 10:08:33 UTC (rev 7650)
@@ -237,6 +237,7 @@
site/radius.conf
site/readers.conf
site/sasl.conf
+site/send-uucp.cf
site/startup.tcl
site/startup_innd.pl
site/storage.conf
More information about the inn-committers
mailing list