diff options
author | peter <peter@FreeBSD.org> | 1996-09-07 18:48:52 +0000 |
---|---|---|
committer | peter <peter@FreeBSD.org> | 1996-09-07 18:48:52 +0000 |
commit | 79ba94b99fd97463c1bbaf51da25a7911ca4cb42 (patch) | |
tree | eb2614adde8d84305f122c7c9daf4ff3119e2065 /usr.sbin/ctm/mkCTM | |
parent | a80e135e4928df7b12e994f9d506fe75e8e422c5 (diff) | |
download | FreeBSD-src-79ba94b99fd97463c1bbaf51da25a7911ca4cb42.zip FreeBSD-src-79ba94b99fd97463c1bbaf51da25a7911ca4cb42.tar.gz |
- resync with configs running on freefall
- add ctm_conf.gnats from freefall
- add support for doing both the immediate mailout and the queued mailout.
- use "sendmail -odq -t" rather than "sendamil -t" to make it queue to
the mailqueue rather than immediately begin transmission. This allows
us to take advantage of our ordered dequeueing system without blowing
WC's T1 to hell with a 50 part mailout in parallel.
- bump the max ctm size from 3MB to 10MB.... This is mainly for the fast
list.
Diffstat (limited to 'usr.sbin/ctm/mkCTM')
-rw-r--r-- | usr.sbin/ctm/mkCTM/ctm_conf.cvs-cur | 7 | ||||
-rw-r--r-- | usr.sbin/ctm/mkCTM/ctm_conf.gnats | 8 | ||||
-rw-r--r-- | usr.sbin/ctm/mkCTM/ctm_conf.smp-cur | 5 | ||||
-rw-r--r-- | usr.sbin/ctm/mkCTM/ctm_conf.src-cur | 4 | ||||
-rw-r--r-- | usr.sbin/ctm/mkCTM/mkCTM | 13 |
5 files changed, 29 insertions, 8 deletions
diff --git a/usr.sbin/ctm/mkCTM/ctm_conf.cvs-cur b/usr.sbin/ctm/mkCTM/ctm_conf.cvs-cur index b29fd86..c4f8293 100644 --- a/usr.sbin/ctm/mkCTM/ctm_conf.cvs-cur +++ b/usr.sbin/ctm/mkCTM/ctm_conf.cvs-cur @@ -2,6 +2,7 @@ set CTMname cvs-cur set CTMref /home/ncvs -set CTMdest $CTMSW/../CTM-priv/$CTMname -set CTMdont {\.core$|^/CVSROOT/history.*$|^/src/secure|^/src/eBones|^/src/kerberosIV|/#cvs|/\.#} -set CTMmail ctm-cvs-cur@freebsd.org +set CTMdont {\.core$|^/CVSROOT/history.*$|^/src/secure|^/src/eBones|^/src/kerberosIV|/#cvs|/\.#|^CVSROOT/val-tags$} +set CTMmail ctm-cvs-cur-fast@freebsd.org +set CTMqueuemail ctm-cvs-cur@freebsd.org +set CTMqueue /home/ctm/queue/ctm-cvs-cur diff --git a/usr.sbin/ctm/mkCTM/ctm_conf.gnats b/usr.sbin/ctm/mkCTM/ctm_conf.gnats new file mode 100644 index 0000000..4c9a23f --- /dev/null +++ b/usr.sbin/ctm/mkCTM/ctm_conf.gnats @@ -0,0 +1,8 @@ +#!/usr/local/bin/tclsh + +#set CTMfirst 1 +set CTMname gnats +set CTMref /home/gnats +set CTMdest $CTMSW/../CTM-pub/$CTMname +#set CTMdont {} +set CTMmail ctm-gnats@freebsd.org diff --git a/usr.sbin/ctm/mkCTM/ctm_conf.smp-cur b/usr.sbin/ctm/mkCTM/ctm_conf.smp-cur index 8d8d59c..56d538d 100644 --- a/usr.sbin/ctm/mkCTM/ctm_conf.smp-cur +++ b/usr.sbin/ctm/mkCTM/ctm_conf.smp-cur @@ -2,6 +2,5 @@ set CTMname smp-cur set CTMref /home/smp -set CTMdest $CTMSW/../CTM-priv/$CTMname -set CTMdont {\.core$|^/CVSROOT/history.*$|/#cvs|/\.#} -set CTMmail smp-cvs-cur +set CTMdont {\.core$|^/CVSROOT/history.*$|/#cvs|/\.#|^CVSROOT/val-tags$} +set CTMmail smp-cvs-cur@freebsd.org diff --git a/usr.sbin/ctm/mkCTM/ctm_conf.src-cur b/usr.sbin/ctm/mkCTM/ctm_conf.src-cur index c24262f..df9bba7 100644 --- a/usr.sbin/ctm/mkCTM/ctm_conf.src-cur +++ b/usr.sbin/ctm/mkCTM/ctm_conf.src-cur @@ -3,4 +3,6 @@ set CTMname src-cur set CTMref /c/src set CTMdont {\.core$|/CVS$|/CVS/|^/secure|^/eBones|/#cvs|/\.#} -set CTMmail ctm-src-cur@freebsd.org +set CTMmail ctm-src-cur-fast@freebsd.org +set CTMqueue /home/ctm/queue/ctm-src-cur +set CTMqueuemail ctm-src-cur@freebsd.org diff --git a/usr.sbin/ctm/mkCTM/mkCTM b/usr.sbin/ctm/mkCTM/mkCTM index 3f884c1..7dced20 100644 --- a/usr.sbin/ctm/mkCTM/mkCTM +++ b/usr.sbin/ctm/mkCTM/mkCTM @@ -123,6 +123,10 @@ cd $CTMSW set CTMapply 1 set CTMdont {^///} set CTMmail {} +set CTMqueue {} +set CTMqueuemail {} +set CTMmaxctm 10000000 +set CTMmaxmsg 100000 set CTMsuff {} set CTMdate [exec date -u +%Y%m%d%H%M%SZ] set CTMtmp {} @@ -327,7 +331,12 @@ while 1 { if {$CTMmail != ""} { puts "Mailing delta" flush stdout - exec $CTMSW/ctm_smail -m 100000 -c 3000000 $CTMdest/${nm}.gz $CTMmail >&@ stdout + exec $CTMSW/ctm_smail -m $CTMmaxmsg -c $CTMmaxctm $CTMdest/${nm}.gz $CTMmail >&@ stdout + if {$CTMqueue != "" && $CTMqueuemail != ""} { + puts "Queueing delta" + flush stdout + exec $CTMSW/ctm_smail -m $CTMmaxmsg -c $CTMmaxctm -q $CTMqueue $CTMdest/${nm}.gz $CTMqueuemail >&@ stdout + } } exec echo mailed > $CTMlock @@ -342,6 +351,8 @@ while 1 { set CTMsuff A set CTMcopy "" set CTMmail "" + set CTMqueue "" + set CTMqueuemail "" set CTMapply 0 set CTMspecial 1 exec rm -f $CTMlock |