From 47a5bd3f21a95b05b96426276c37735a8b296777 Mon Sep 17 00:00:00 2001 From: Peter Wemm Date: Sat, 7 Sep 1996 18:48:52 +0000 Subject: [PATCH] - 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. --- usr.sbin/ctm/ctm_dequeue/ctm_dequeue.c | 4 ++-- usr.sbin/ctm/ctm_smail/ctm_smail.c | 4 ++-- usr.sbin/ctm/mkCTM/ctm_conf.cvs-cur | 7 ++++--- usr.sbin/ctm/mkCTM/ctm_conf.gnats | 8 ++++++++ usr.sbin/ctm/mkCTM/ctm_conf.smp-cur | 5 ++--- usr.sbin/ctm/mkCTM/ctm_conf.src-cur | 4 +++- usr.sbin/ctm/mkCTM/mkCTM | 13 ++++++++++++- 7 files changed, 33 insertions(+), 12 deletions(-) create mode 100644 usr.sbin/ctm/mkCTM/ctm_conf.gnats diff --git a/usr.sbin/ctm/ctm_dequeue/ctm_dequeue.c b/usr.sbin/ctm/ctm_dequeue/ctm_dequeue.c index a3faf27e7464..7e5904554ea8 100644 --- a/usr.sbin/ctm/ctm_dequeue/ctm_dequeue.c +++ b/usr.sbin/ctm/ctm_dequeue/ctm_dequeue.c @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: ctm_dequeue.c,v 1.1 1996/07/01 20:53:55 gpalmer Exp $ + * $Id: ctm_dequeue.c,v 1.2 1996/07/12 13:12:46 gpalmer Exp $ */ /* @@ -203,7 +203,7 @@ open_sendmail() FILE *fp; char buf[100]; - sprintf(buf, "%s -t", _PATH_SENDMAIL); + sprintf(buf, "%s -odq -t", _PATH_SENDMAIL); if ((fp = popen(buf, "w")) == NULL) err("cannot start sendmail"); return fp; diff --git a/usr.sbin/ctm/ctm_smail/ctm_smail.c b/usr.sbin/ctm/ctm_smail/ctm_smail.c index 4c97e8ad2038..9df11c9c5d3f 100644 --- a/usr.sbin/ctm/ctm_smail/ctm_smail.c +++ b/usr.sbin/ctm/ctm_smail/ctm_smail.c @@ -10,7 +10,7 @@ * In return you should think about all the nice people who give away software. * Maybe you should write some free software too. * - * $Id$ + * $Id: ctm_smail.c,v 1.6 1996/07/01 20:54:11 gpalmer Exp $ */ #include @@ -422,7 +422,7 @@ open_sendmail() FILE *fp; char buf[100]; - sprintf(buf, "%s -t", _PATH_SENDMAIL); + sprintf(buf, "%s -odq -t", _PATH_SENDMAIL); if ((fp = popen(buf, "w")) == NULL) err("cannot start sendmail"); return fp; diff --git a/usr.sbin/ctm/mkCTM/ctm_conf.cvs-cur b/usr.sbin/ctm/mkCTM/ctm_conf.cvs-cur index b29fd8696861..c4f829304070 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 000000000000..4c9a23f58d4c --- /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 8d8d59caed7b..56d538d62672 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 c24262fe22e2..df9bba7f8793 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 3f884c138995..7dced20cf5b0 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