From d65b6b5bcd4e89ce1a0eeb74131f98093e85bb3a Mon Sep 17 00:00:00 2001 From: usmannasir Date: Mon, 21 Aug 2023 11:57:45 +0500 Subject: [PATCH] bug fix: mail function shift --- install/install.py | 2 +- plogical/IncScheduler.py | 5 ----- plogical/renew.py | 5 +++++ plogical/upgrade.py | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/install/install.py b/install/install.py index 1ab1b78ef..8fe180987 100755 --- a/install/install.py +++ b/install/install.py @@ -1872,7 +1872,7 @@ def setup_cron(self): 0 * * * * /usr/local/CyberCP/bin/python /usr/local/CyberCP/postfixSenderPolicy/client.py hourlyCleanup >/dev/null 2>&1 0 0 1 * * /usr/local/CyberCP/bin/python /usr/local/CyberCP/postfixSenderPolicy/client.py monthlyCleanup >/dev/null 2>&1 0 2 * * * /usr/local/CyberCP/bin/python /usr/local/CyberCP/plogical/upgradeCritical.py >/dev/null 2>&1 -0 2 * * * /usr/local/CyberCP/bin/python /usr/local/CyberCP/plogical/renew.py >/dev/null 2>&1 +0 0 * * 4 /usr/local/CyberCP/bin/python /usr/local/CyberCP/plogical/renew.py >/dev/null 2>&1 7 0 * * * "/root/.acme.sh"/acme.sh --cron --home "/root/.acme.sh" > /dev/null 0 0 * * * /usr/local/CyberCP/bin/python /usr/local/CyberCP/IncBackups/IncScheduler.py Daily 0 0 * * 0 /usr/local/CyberCP/bin/python /usr/local/CyberCP/IncBackups/IncScheduler.py Weekly diff --git a/plogical/IncScheduler.py b/plogical/IncScheduler.py index ac6c3cace..eff196b29 100644 --- a/plogical/IncScheduler.py +++ b/plogical/IncScheduler.py @@ -1389,11 +1389,6 @@ def SendToS3Cloud(FileName, RemoteBackupCofigID, backupID, scheduleID): print('%s. [SendToS3Cloud]' % (str(msg))) logging.writeToFile('%s. [SendToS3Cloud]' % (str(msg))) - @staticmethod - def FixMailSSL(): - for website in Websites.objects.all(): - virtualHostUtilities.setupAutoDiscover(1, '/home/cyberpanel/templogs', website.domain, website.admin) - @staticmethod def v2Backups(function): try: diff --git a/plogical/renew.py b/plogical/renew.py index 8f16c9d05..fd54a15e6 100644 --- a/plogical/renew.py +++ b/plogical/renew.py @@ -142,6 +142,11 @@ def SSLObtainer(self): except BaseException as msg: logging.writeToFile(str(msg) + '. Renew.SSLObtainer') + @staticmethod + def FixMailSSL(): + for website in Websites.objects.all(): + virtualHostUtilities.setupAutoDiscover(1, '/home/cyberpanel/templogs', website.domain, website.admin) + if __name__ == "__main__": sslOB = Renew() diff --git a/plogical/upgrade.py b/plogical/upgrade.py index ef969ca67..5cb08e55e 100755 --- a/plogical/upgrade.py +++ b/plogical/upgrade.py @@ -2794,7 +2794,7 @@ def runSomeImportantBash(): 0 * * * * /usr/local/CyberCP/bin/python /usr/local/CyberCP/postfixSenderPolicy/client.py hourlyCleanup >/dev/null 2>&1 0 0 1 * * /usr/local/CyberCP/bin/python /usr/local/CyberCP/postfixSenderPolicy/client.py monthlyCleanup >/dev/null 2>&1 0 2 * * * /usr/local/CyberCP/bin/python /usr/local/CyberCP/plogical/upgradeCritical.py >/dev/null 2>&1 -0 2 * * * /usr/local/CyberCP/bin/python /usr/local/CyberCP/plogical/renew.py >/dev/null 2>&1 +0 0 * * 4 /usr/local/CyberCP/bin/python /usr/local/CyberCP/plogical/renew.py >/dev/null 2>&1 7 0 * * * "/root/.acme.sh"/acme.sh --cron --home "/root/.acme.sh" > /dev/null */3 * * * * if ! find /home/*/public_html/ -maxdepth 2 -type f -newer /usr/local/lsws/cgid -name '.htaccess' -exec false {} +; then /usr/local/lsws/bin/lswsctrl restart; fi """ @@ -2833,7 +2833,7 @@ def runSomeImportantBash(): 0 * * * * /usr/local/CyberCP/bin/python /usr/local/CyberCP/postfixSenderPolicy/client.py hourlyCleanup >/dev/null 2>&1 0 0 1 * * /usr/local/CyberCP/bin/python /usr/local/CyberCP/postfixSenderPolicy/client.py monthlyCleanup >/dev/null 2>&1 0 2 * * * /usr/local/CyberCP/bin/python /usr/local/CyberCP/plogical/upgradeCritical.py >/dev/null 2>&1 -0 2 * * * /usr/local/CyberCP/bin/python /usr/local/CyberCP/plogical/renew.py >/dev/null 2>&1 +0 0 * * 4 /usr/local/CyberCP/bin/python /usr/local/CyberCP/plogical/renew.py >/dev/null 2>&1 7 0 * * * "/root/.acme.sh"/acme.sh --cron --home "/root/.acme.sh" > /dev/null 0 0 * * * /usr/local/CyberCP/bin/python /usr/local/CyberCP/IncBackups/IncScheduler.py Daily 0 0 * * 0 /usr/local/CyberCP/bin/python /usr/local/CyberCP/IncBackups/IncScheduler.py Weekly