diff --git a/install/install.py b/install/install.py index bf69af661..bd308a778 100755 --- a/install/install.py +++ b/install/install.py @@ -1742,6 +1742,15 @@ autocreate_system_folders = On 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 + +0 0 * * 0 /usr/local/CyberCP/bin/python /usr/local/CyberCP/IncBackups/IncScheduler.py '30 Minutes' +0 0 * * 0 /usr/local/CyberCP/bin/python /usr/local/CyberCP/IncBackups/IncScheduler.py '1 Hour' +0 0 * * 0 /usr/local/CyberCP/bin/python /usr/local/CyberCP/IncBackups/IncScheduler.py '6 Hours' +0 0 * * 0 /usr/local/CyberCP/bin/python /usr/local/CyberCP/IncBackups/IncScheduler.py '12 Hours' +0 0 * * 0 /usr/local/CyberCP/bin/python /usr/local/CyberCP/IncBackups/IncScheduler.py '1 Day' +0 0 * * 0 /usr/local/CyberCP/bin/python /usr/local/CyberCP/IncBackups/IncScheduler.py '3 Days' +0 0 * * 0 /usr/local/CyberCP/bin/python /usr/local/CyberCP/IncBackups/IncScheduler.py '1 Week' + */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 """ diff --git a/plogical/IncScheduler.py b/plogical/IncScheduler.py index 9dd657996..a92e421a9 100644 --- a/plogical/IncScheduler.py +++ b/plogical/IncScheduler.py @@ -960,7 +960,7 @@ Automatic backup failed for %s on %s. logging.writeToFile('%s. [WPUpdates:767]' % (str(msg))) @staticmethod - def RemoteBackup(): + def RemoteBackup(function): try: from websiteFunctions.models import RemoteBackupSchedule, RemoteBackupsites, WPSites from loginSystem.models import Administrator @@ -1352,6 +1352,10 @@ def main(): parser.add_argument('--planName', help='Plan name for AWS!') args = parser.parse_args() + if args.function == '30 Minutes' or args.function == '30 Minutes' or args.function == '1 Hour' or args.function == '6 Hours' or args.function == '12 Hours' or args.function == '1 Day' or args.function == '3 Days' or args.function == '1 Week': + IncScheduler.RemoteBackup(args.function) + return 0 + if args.function == 'forceRunAWSBackup': IncScheduler.forceRunAWSBackup(args.planName) return 0 @@ -1367,12 +1371,12 @@ def main(): ### IncScheduler.startBackup(args.function) - IncScheduler.RemoteBackup() - # IncScheduler.runGoogleDriveBackups(args.function) - # IncScheduler.git(args.function) - # IncScheduler.checkDiskUsage() - # IncScheduler.startNormalBackups(args.function) - # IncScheduler.runAWSBackups(args.function) + + IncScheduler.runGoogleDriveBackups(args.function) + IncScheduler.git(args.function) + IncScheduler.checkDiskUsage() + IncScheduler.startNormalBackups(args.function) + IncScheduler.runAWSBackups(args.function) ib.join() diff --git a/plogical/upgrade.py b/plogical/upgrade.py index 5212b4712..5839c1e1c 100755 --- a/plogical/upgrade.py +++ b/plogical/upgrade.py @@ -2566,6 +2566,22 @@ vmail writeToFile = open(cronPath, 'a') writeToFile.write(content) writeToFile.close() + + if data.find("IncScheduler.py '30 Minutes'") == -1: + content = """ +0 0 * * 0 /usr/local/CyberCP/bin/python /usr/local/CyberCP/IncBackups/IncScheduler.py '30 Minutes' +0 0 * * 0 /usr/local/CyberCP/bin/python /usr/local/CyberCP/IncBackups/IncScheduler.py '1 Hour' +0 0 * * 0 /usr/local/CyberCP/bin/python /usr/local/CyberCP/IncBackups/IncScheduler.py '6 Hours' +0 0 * * 0 /usr/local/CyberCP/bin/python /usr/local/CyberCP/IncBackups/IncScheduler.py '12 Hours' +0 0 * * 0 /usr/local/CyberCP/bin/python /usr/local/CyberCP/IncBackups/IncScheduler.py '1 Day' +0 0 * * 0 /usr/local/CyberCP/bin/python /usr/local/CyberCP/IncBackups/IncScheduler.py '3 Days' +0 0 * * 0 /usr/local/CyberCP/bin/python /usr/local/CyberCP/IncBackups/IncScheduler.py '1 Week' +""" + writeToFile = open(cronPath, 'a') + writeToFile.write(content) + writeToFile.close() + + else: content = """ 0 * * * * /usr/local/CyberCP/bin/python /usr/local/CyberCP/plogical/findBWUsage.py >/dev/null 2>&1