- 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.
This commit is contained in:
parent
bfef935198
commit
47a5bd3f21
@ -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;
|
||||
|
@ -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 <stdio.h>
|
||||
@ -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;
|
||||
|
@ -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
|
||||
|
8
usr.sbin/ctm/mkCTM/ctm_conf.gnats
Normal file
8
usr.sbin/ctm/mkCTM/ctm_conf.gnats
Normal file
@ -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
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user