- removed outdated TODO

[packages/inn.git] / inn-config.patch

diff -Nur old/samples/cycbuff.conf new/samples/cycbuff.conf
--- old/samples/cycbuff.conf	2004-01-07 22:47:19.000000000 +0000
+++ new/samples/cycbuff.conf	2004-08-06 12:33:41.000000000 +0000
@@ -10,9 +10,9 @@
 # "cycbuff" (literally) : symbolic buffer name : path to buffer file : 
 #       length of symbolic buffer in kilobytes in decimal (1KB = 1024 bytes)
 
-cycbuff:ONE:/export/cycbuffs/one:512000
-cycbuff:TWO:/export/cycbuffs/two:512000
-cycbuff:THREE:/export/cycbuffs/three:512000
+cycbuff:ONE:/var/spool/news/cycbuffs/one:512000
+cycbuff:TWO:/var/spool/news/cycbuffs/two:512000
+cycbuff:THREE:/var/spool/news/cycbuffs/three:512000
 
 # 2. Meta-cyclic buffers
 # Format:
--- inn-2.5.3/samples/inn.conf.in.orig	2013-06-13 15:49:58.887245670 +0200
+++ inn-2.5.3/samples/inn.conf.in	2013-06-13 16:20:45.710540510 +0200
@@ -17,11 +17,11 @@
 # The following parameters are most likely to need setting, although the
 # defaults generated by configure may be reasonable.
 
-mta:                         "@SENDMAIL@ -oi -oem %s"
+mta:                         "@SENDMAIL@ -oi %s"
 organization:                "A poorly-installed InterNetNews site"
 ovmethod:                    tradindexed
 hismethod:                   hisv6
-pathhost:                    @HOSTNAME@
+pathhost:                    localhost
 pathnews:                    @prefix@
 
 #runasuser:
@@ -37,8 +37,8 @@
 # Feed Configuration
 
 artcutoff:                   10
-#bindaddress:
-#bindaddress6:
+#bindaddress:                 all
+#bindaddress6:                all
 dontrejectfiltered:          false
 hiscachesize:                256
 ignorenewsgroups:            false
@@ -48,13 +48,13 @@
 maxconnections:              50
 #pathalias:
 #pathcluster:
-pgpverify:                   @DO_PGPVERIFY@
+pgpverify:                   true
 port:                        119
 refusecybercancels:          false
 remembertrash:               true
-#sourceaddress:
-#sourceaddress6:
-verifycancels:               false
+#sourceaddress:               any
+#sourceaddress6:              any
+verifycancels:               true
 verifygroups:                false
 wanttrash:                   false
 wipcheck:                    5
@@ -71,6 +71,7 @@
 nfswriter:                   false
 overcachesize:               64
 #ovgrouppat:
+# note: must not be changed to false if using tradspool
 storeonxref:                 true
 useoverchan:                 false
 wireformat:                  false
@@ -78,7 +79,7 @@
 
 # Reading
 
-allownewnews:                true
+allownewnews:                false
 articlemmap:                 true
 clienttimeout:               1800
 initialtimeout:              10
@@ -109,8 +110,8 @@
 addnntppostingdate:          true
 addnntppostinghost:          true
 checkincludedtext:           false
-#complaints:
-#fromhost:
+complaints:                  abuse@localhost
+#fromhost:                    ""
 localmaxartsize:             1000000
 #moderatormailer:
 nnrpdauthsender:             false
@@ -122,7 +123,7 @@
 # Posting -- Exponential Backoff
 
 backoffauth:                 false
-#backoffdb:
+#backoffdb:                   /var/lib/news/backoff
 backoffk:                    1
 backoffpostfast:             0
 backoffpostslow:             1
@@ -152,7 +153,7 @@
 
 # Logging
 
-docnfsstat:                  false
+docnfsstat:                  true
 htmlstatus:                  true
 incominglogfrequency:        200
 logartsize:                  true
@@ -179,7 +180,7 @@
 keepmmappedthreshold:        1024
 #maxcmdreadsize:
 maxforks:                    10
-nicekids:                    4
+nicekids:                    0
 nicenewnews:                 0
 nicennrpd:                   0
 pauseretrytime:              300
--- inn-2.5.3/samples/newsfeeds.in.orig	2012-06-15 20:25:36.000000000 +0200
+++ inn-2.5.3/samples/newsfeeds.in	2013-06-13 16:26:55.857199461 +0200
@@ -41,8 +41,18 @@
 # Empty default subscription list, reject all incoming articles (including
 # locally posted articles) with a distribution of "local" or
 # "collabra-internal", accept all others.
-ME:!*/!local,!collabra-internal::
+#ME:!*/!local,!collabra-internal::
 
+## Default of  everything to everybody except for junk, control, anything
+## with "local" as the newsgroup prefix (i.e. matches "localhost.stuff") or
+## groups under foo. Articles posted to any group under alt.binaries.warez
+## will not get propagated, even if they're cross posted to something that
+## is.
+ME\
+	:*,@alt.binaries.warez.*,!junk,!control*,!local*,!foo.*\
+        /pl,world,usa,na,gnu,bionet,pubnet,u3b,eunet,vmsnet,inet,ddn,k12\
+	::
+ 
 # The same as the above, but would reject all posts that have
 # news.example.com in the path (posts passing through that site).
 #ME/news.example.com:!*/!local,!collabra-internal::
@@ -139,4 +149,4 @@
 # come with INN).
 #capture!\
 #	:*/foo\
-#	:Tp,H2:/usr/local/bin/capture %s
+#	:Tp,H2:/usr/bin/capture %s
--- inn-2.5.3/samples/readers.conf.orig	2013-06-13 15:49:58.903912336 +0200
+++ inn-2.5.3/samples/readers.conf	2013-06-13 16:28:23.533864301 +0200
@@ -55,7 +55,7 @@
 # the local machine
 
 auth "localhost" {
-    hosts: "localhost, 127.0.0.1, ::1, stdin"
+    hosts: "localhost, 127.0.0.1, ipv6-localhost, ::1, stdin"
     default: "<localhost>"
 }