Update to queue group-based config in use on the list server.

2 files changed, 37 insertions, 36 deletions

diff --git a/gnu/usr.sbin/sendmail/cf/cf/openbsd-bulk.mc b/gnu/usr.sbin/sendmail/cf/cf/openbsd-bulk.mc
index 687a46a0cf9..be6f07fdd58 100644
--- a/gnu/usr.sbin/sendmail/cf/cf/openbsd-bulk.mc
+++ b/gnu/usr.sbin/sendmail/cf/cf/openbsd-bulk.mc
@@ -2,35 +2,17 @@ divert(-1)
 #
 # Sendmail configuration file for lists.openbsd.org
 #
-# This config just accepts bulk mail from mj2 on port 24 and delivers it.
-# It is a queue-only config--we use persistent queue runners to do the
-# actual delivery.
-#
-# The queue runners are started from rc.local as follows:
-#
-# set -- q0 50 modification 1s q1 5 host 1m q2 5 host 2m q3 5 host 5m qold 10 host 10m
-# _key=8675309
-# while test $# -ge 4; do
-#	/usr/sbin/sendmail -C/etc/mail/bulk.cf -Lsm-queue -OQueueSortOrder=$3 \
-#	    -OMaxQueueChildren=$2 -OQueueDirectory=/var/spool/mqueue/$1 \
-#	    -OProcessTitlePrefix=$1 -OPidFile=/var/run/runner-$1.pid \
-#	    -OSharedMemoryKey=$_key -q$4
-#	_key=$(( $_key + 10 ))
-#	shift 4
-# done
-#
-# A cron job moves failed messages progressively from q0 -> qold
+# This config accepts bulk mail from mj2 on port 24 and delivers it.
 #
 
 divert(0)dnl
-VERSIONID(`$OpenBSD: openbsd-bulk.mc,v 1.2 2005/01/06 17:21:03 millert Exp $')
+VERSIONID(`$OpenBSD: openbsd-bulk.mc,v 1.3 2008/04/02 15:03:01 millert Exp $')
 OSTYPE(openbsd)dnl
 dnl
 dnl Advertise ourselves as ``openbsd.org''
 define(`confSMTP_LOGIN_MSG', `openbsd.org Sendmail $v/$Z/bulk ready willing and able at $b')dnl
 dnl
 dnl Override some default values
-define(`confDELIVERY_MODE', `q')dnl
 define(`confTRY_NULL_MX_LIST', `True')dnl
 define(`confMAX_HOP', `30')dnl
 define(`confQUEUE_LA', `25')dnl
@@ -38,7 +20,24 @@ define(`confREFUSE_LA', `100')dnl
 dnl
 dnl Some alternate paths so we don't conflict with sendmail on port 25
 define(`confPID_FILE', `/var/run/bulkmail.pid')dnl
-define(`QUEUE_DIR', `/var/spool/mqueue/q0')dnl
+dnl
+dnl Wait at least 27 minutes before trying to redeliver a message.
+define(`confMIN_QUEUE_AGE', `27m')dnl
+dnl
+dnl Just queue incoming messages, we have queue runners for actual delivery
+define(`confDELIVERY_MODE', `q')dnl
+dnl
+dnl Don't prioritize a message based on the number of recepients
+dnl or Precedence header.  We only care about message size and
+dnl number of retries.
+define(`confWORK_RECIPIENT_FACTOR', `0')dnl
+define(`confWORK_CLASS_FACTOR', `0')dnl
+define(`confRETRY_FACTOR', `90000')dnl
+dnl
+dnl One queue group, many dirs, max 80 runners
+define(`confMAX_QUEUE_CHILDREN', `80')
+QUEUE_GROUP(`mqueue', `P=/var/spool/mqueue/bulk*, R=5, r=10, F=f I=1')dnl
+dnl QUEUE_GROUP(`retry', `P=/var/spool/mqueue/fail*, R=5, r=10, F=f I=5 N=4')dnl
 dnl
 dnl Add a prefix to differentiate outgoing bulk messages from incoming ones
 define(`confPROCESS_TITLE_PREFIX', `bulk')dnl
@@ -54,16 +53,6 @@ dnl Keep host status on disk between sendmail runs in the .hoststat dir
 define(`confHOST_STATUS_DIRECTORY', `/var/spool/mqueue/.hoststat')dnl
 define(`confTO_HOSTSTATUS', `30m')dnl
 dnl
-dnl Wait at least 27 minutes before trying to redeliver a message.
-define(`confMIN_QUEUE_AGE', `27m')dnl
-dnl
-dnl Don't prioritize a message based on the number of recepients.
-dnl This prevents retries from having higher priority than new batches.
-define(`confWORK_RECIPIENT_FACTOR', `0')dnl
-dnl
-dnl Reduce ClassFactor
-define(`confWORK_CLASS_FACTOR', `1000')dnl
-dnl
 dnl Always use fully qualified domains
 FEATURE(always_add_domain)dnl
 dnl
diff --git a/gnu/usr.sbin/sendmail/cf/cf/openbsd-lists.mc b/gnu/usr.sbin/sendmail/cf/cf/openbsd-lists.mc
index e6e5fd8c81e..1fd1d4807fb 100644
--- a/gnu/usr.sbin/sendmail/cf/cf/openbsd-lists.mc
+++ b/gnu/usr.sbin/sendmail/cf/cf/openbsd-lists.mc
@@ -8,23 +8,26 @@ divert(-1)
 #
 
 divert(0)dnl
-VERSIONID(`$OpenBSD: openbsd-lists.mc,v 1.16 2005/01/06 17:21:03 millert Exp $')
+VERSIONID(`$OpenBSD: openbsd-lists.mc,v 1.17 2008/04/02 15:03:01 millert Exp $')
 OSTYPE(openbsd)dnl
 dnl
 dnl Advertise ourselves as ``openbsd.org''
-define(`confSMTP_LOGIN_MSG', `openbsd.org Sendmail $v/$Z/millert ready willing and able at $b')dnl
+define(`confSMTP_LOGIN_MSG', `openbsd.org spamd IP-based SPAM blocker; $d')dnl
 dnl
 dnl Override some default values
 define(`confPRIVACY_FLAGS', `authwarnings,needmailhelo,noexpn,novrfy,noetrn,noverb,nobodyreturn')dnl
 define(`confTRY_NULL_MX_LIST', `True')dnl
 define(`confMAX_HOP', `30')dnl
-define(`confQUEUE_LA', `25')dnl
-define(`confREFUSE_LA', `50')dnl
+define(`confQUEUE_LA', `6')dnl
+define(`confREFUSE_LA', `20')dnl
 dnl
 dnl Some broken nameservers will return SERVFAIL (a temporary failure)
 dnl on T_AAAA (IPv6) lookups.
 define(`confBIND_OPTS', `WorkAroundBrokenAAAA')dnl
 dnl
+dnl Do not send postmaster bounce failures
+define(`confDOUBLE_BOUNCE_ADDRESS', `')dnl
+dnl
 dnl Keep host status on disk between sendmail runs in the .hoststat dir
 define(`confHOST_STATUS_DIRECTORY', `/var/spool/mqueue/.hoststat')dnl
 define(`confTO_HOSTSTATUS', `30m')dnl
@@ -89,6 +92,15 @@ dnl
 dnl Spam blocking features
 FEATURE(access_db)dnl
 dnl
+dnl Only allow up to 4 new connections per second
+define(`confCONNECTION_RATE_THROTTLE', `4')dnl
+dnl
+dnl Start to throttle sender after receiving 3 unknown users
+define(`confBAD_RCPT_THROTTLE',`3')dnl
+dnl
+dnl Reject mail from senders who don't wait for us to say hello
+FEATURE(`greet_pause', `700')dnl
+dnl
 dnl milter-regex
 INPUT_MAIL_FILTER(`milter-regex', `S=local:/var/run/milter-regex/sock, T=S:30s;R:2m')dnl
 dnl
@@ -123,7 +135,7 @@ KSirCamWormMarker regex -f -aSUSPECT multipart/mixed;boundary=----.+_Outlook_Exp
 #
 #  Names that won't be allowed in a To: line (local-part and domains)
 #
-C{RejectToLocalparts}		friend you user
+C{RejectToLocalparts}		friend you user 3Dobsdpaypal obsdpaypal
 C{RejectToDomains}		public.com the-internet.com
 
 LOCAL_RULESETS