svctool: use split from conf-split, bigtodo=0 when creating queue

indimail · Dec 29, 2023 · 382388a · 382388a
1 parent 6506a77
commit 382388a
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 9 deletions.
diff --git a/indimail-mta-x/doc/ChangeLog b/indimail-mta-x/doc/ChangeLog
@@ -145,7 +145,7 @@ o - New program printass to print entries in users/cdb, users/assign file
 81. qlocal_upgrade.in: Fix symbolic link TLS_CIPHER_LIST in
     control/global_vars to point to control/servercipherlist
 - 29/12/2023
-82. svctool: fixed syntax error
+82. svctool: use split from conf-split, bigtodo=0 when creating queue
 83. qlocal_upgrade: fixed cron copying cron config
 
 * Tue Oct 17 2023 18:34:04 +0000 Manvendra Bhangui <indimail-mta@indimail.org> 3.0.5-1.1%{?dist}

diff --git a/indimail-mta-x/svctool.in b/indimail-mta-x/svctool.in
@@ -1,5 +1,5 @@
 #
-# $Id: svctool.in,v 2.716 2023-12-29 21:31:40+05:30 Cprogrammer Exp mbhangui $
+# $Id: svctool.in,v 2.716 2023-12-29 22:47:14+05:30 Cprogrammer Exp mbhangui $
 #
 
 #
@@ -27,7 +27,7 @@ host=@HOST@
 shared_objects=0
 use_dlmopen=0
 skip_sendmail_check=0
-RCSID="# \$Id: svctool.in,v 2.716 2023-12-29 21:31:40+05:30 Cprogrammer Exp mbhangui $"
+RCSID="# \$Id: svctool.in,v 2.716 2023-12-29 22:47:14+05:30 Cprogrammer Exp mbhangui $"
 
 #
 # End of User Configuration
@@ -2426,6 +2426,9 @@ fi
 if [ ! -f "$DESTDIR"$sysconfdir/control/global_vars/CONFSPLIT ] ; then
 	echo QUEUESPLIT > "$DESTDIR"$sysconfdir/control/global_vars/CONFSPLIT
 fi
+if [ ! -f "$DESTDIR"$sysconfdir/control/global_vars/BIGTODO ] ; then
+	echo 0 > "$DESTDIR"$sysconfdir/control/global_vars/BIGTODO
+fi
 if [ $usefsync -eq 1 -o $usefdatasync -eq 1 ] ; then
 	echo 1 > "$DESTDIR"$sysconfdir/control/global_vars/USE_FDATASYNC
 else
@@ -6822,9 +6825,11 @@ fi
 if [ $nooverwrite -eq 0 -o ! -d "$DESTDIR"$QUEUE_BASE/nqueue ] ; then
 	echo "Creating Queue "$DESTDIR"$QUEUE_BASE/nqueue"
 	if [ -f "$DESTDIR"$QmailBinPrefix/bin/queue-fix ] ; then
-		"$DESTDIR"$QmailBinPrefix/bin/queue-fix "$DESTDIR"$QUEUE_BASE/nqueue > /dev/null
+		"$DESTDIR"$QmailBinPrefix/bin/queue-fix -s QUEUESPLIT -b 0 \
+			"$DESTDIR"$QUEUE_BASE/nqueue > /dev/null
 	else
-		./queue-fix "$DESTDIR"$QUEUE_BASE/nqueue > /dev/null
+		./queue-fix -s QUEUESPLIT -b 0 \
+			"$DESTDIR"$QUEUE_BASE/nqueue > /dev/null
 	fi
 	QUEUE_NO=$QUEUE_START
 	COUNT=1
@@ -6835,9 +6840,11 @@ if [ $nooverwrite -eq 0 -o ! -d "$DESTDIR"$QUEUE_BASE/nqueue ] ; then
 		fi
 		echo "Creating Queue "$DESTDIR"$QUEUE_BASE/queue"$QUEUE_NO""
 		if [ -f "$DESTDIR"$QmailBinPrefix/bin/queue-fix ] ; then
-			"$DESTDIR"$QmailBinPrefix/bin/queue-fix "$DESTDIR"$QUEUE_BASE/queue"$QUEUE_NO" > /dev/null
+			"$DESTDIR"$QmailBinPrefix/bin/queue-fix -s QUEUESPLIT -b 0 \
+				"$DESTDIR"$QUEUE_BASE/queue"$QUEUE_NO" > /dev/null
 		else
-			./queue-fix "$DESTDIR"$QUEUE_BASE/queue"$QUEUE_NO" > /dev/null
+			./queue-fix -s QUEUESPLIT -b 0 \
+				"$DESTDIR"$QUEUE_BASE/queue"$QUEUE_NO" > /dev/null
 		fi
 		if [ $COUNT -eq $QUEUE_COUNT ] ; then
 			break
@@ -7135,9 +7142,11 @@ fi
 if [ $nooverwrite -eq 0 -o ! -d "$DESTDIR"$QUEUE_BASE/slowq ] ; then
 	echo "Creating Queue "$DESTDIR"$QUEUE_BASE/slowq"
 	if [ -f "$DESTDIR"$QmailBinPrefix/bin/queue-fix ] ; then
-		"$DESTDIR"$QmailBinPrefix/bin/queue-fix -r "$DESTDIR"$QUEUE_BASE/slowq > /dev/null
+		"$DESTDIR"$QmailBinPrefix/bin/queue-fix -s QUEUESPLIT -b 0 \
+			-r "$DESTDIR"$QUEUE_BASE/slowq > /dev/null
 	else
-		./queue-fix -r "$DESTDIR"$QUEUE_BASE/slowq > /dev/null
+		./queue-fix -s QUEUESPLIT -b 0 \
+			-r "$DESTDIR"$QUEUE_BASE/slowq > /dev/null
 	fi
 fi