qlocal_upgrade: fixed cron copying cron config

indimail · Dec 29, 2023 · 6506a77 · 6506a77
1 parent 499a17a
commit 6506a77
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/indimail-mta-x/doc/ChangeLog b/indimail-mta-x/doc/ChangeLog
@@ -146,6 +146,7 @@ o - New program printass to print entries in users/cdb, users/assign file
     control/global_vars to point to control/servercipherlist
 - 29/12/2023
 82. svctool: fixed syntax error
+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}
 Release 3.0.5-1.1 Start 11/09/2023 End 17/10/2023

diff --git a/indimail-mta-x/qlocal_upgrade.in b/indimail-mta-x/qlocal_upgrade.in
@@ -1,5 +1,5 @@
 #
-# $Id: qlocal_upgrade.in,v 1.59 2023-12-23 00:16:10+05:30 Cprogrammer Exp mbhangui $
+# $Id: qlocal_upgrade.in,v 1.60 2023-12-29 21:53:04+05:30 Cprogrammer Exp mbhangui $
 #
 PATH=/bin:/usr/bin:/usr/sbin:/sbin
 chown=$(which chown)
@@ -26,15 +26,15 @@ check_update_if_diff()
 
 do_install()
 {
-echo "Running $1 $Id: qlocal_upgrade.in,v 1.59 2023-12-23 00:16:10+05:30 Cprogrammer Exp mbhangui $"
+echo "Running $1 $Id: qlocal_upgrade.in,v 1.60 2023-12-29 21:53:04+05:30 Cprogrammer Exp mbhangui $"
 # upgrade libindimail (VIRTUAL_PKG_LIB) for dynamic loading of libindimail
 # upgrade libmysqlclient path in /etc/indimail/control/libmysql
 /usr/sbin/svctool --fixsharedlibs
 }
 
 do_post_upgrade()
 {
-echo "Running $1 $Id: qlocal_upgrade.in,v 1.59 2023-12-23 00:16:10+05:30 Cprogrammer Exp mbhangui $"
+echo "Running $1 $Id: qlocal_upgrade.in,v 1.60 2023-12-29 21:53:04+05:30 Cprogrammer Exp mbhangui $"
 if [ -x /bin/systemctl -o -x /usr/bin/systemctl ] ; then
 	systemctl is-enabled svscan >/dev/null 2>&1
 	if [ $? -ne 0 ] ; then
@@ -289,7 +289,7 @@ $sed -i 's{--forceauthsmtp --antispoof{--forceauthsmtp --secureauth --antispoof{
 
 # remove STATUSFILE as .svscan.pid serves the same purpose
 rm -f $servicedir/.svscan/variables/STATUSFILE
-if [ ! -f $servicedir/.svscan/variables/AUTOSCAN ] ; then
+if [ ! -f $servicedir/.svscan/variables/AUTOSCAN -a -d $servicedir/.svscan/variables ] ; then
 	echo 1 > $servicedir/.svscan/variables/AUTOSCAN
 fi
 
@@ -383,8 +383,8 @@ fi
 if [ -f /etc/cron.d/cronlist.q ] ; then
   $mv /etc/cron.d/cronlist.q /etc/cron.d/indimail-mta.cron
 fi
-if [ ! -f @sysconfdir@/indimail.cron -a -d /etc/cron.d ] ; then
-	$cp @sysconfdir@/indimail.cron /etc/cron.d/indimail.cron
+if [ ! -f @sysconfdir@/indimail-mta.cron -a -d /etc/cron.d ] ; then
+	$cp @sysconfdir@/indimail-mta.cron /etc/cron.d/indimail-mta.cron
 fi
 }
 
@@ -398,6 +398,9 @@ case $1 in
 esac
 #
 # $Log: qlocal_upgrade.in,v $
+# Revision 1.60  2023-12-29 21:53:04+05:30  Cprogrammer
+# fixed qlocal_upgrade
+#
 # Revision 1.59  2023-12-23 00:16:10+05:30  Cprogrammer
 # renamed cronlist.q to indimail-mta.cron
 #