From 39c3f8b7bdb7c20f1f1a3a93621088617f795f89 Mon Sep 17 00:00:00 2001 From: Monstrofil Date: Tue, 3 Jan 2023 12:26:23 +0200 Subject: [PATCH 1/2] Use correct arguments ordering in CloudLinuxDomains --- CLScript/CloudLinuxDomains.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CLScript/CloudLinuxDomains.py b/CLScript/CloudLinuxDomains.py index 5c947af73..64201546e 100755 --- a/CLScript/CloudLinuxDomains.py +++ b/CLScript/CloudLinuxDomains.py @@ -54,7 +54,7 @@ if __name__ == '__main__': args = parser.parse_args() - pi = CloudLinuxDomains(args.owner, args.name) + pi = CloudLinuxDomains(args.name, args.owner) try: pi.listAll() except: From 1ac7e125cb6688fe6f4565015502ed2c965c6d3d Mon Sep 17 00:00:00 2001 From: Xclusion Media Date: Mon, 23 Jan 2023 16:04:14 +0100 Subject: [PATCH 2/2] Retention for WP backups to S3 Added a check to remove old backup files. This enables the backup retention setting in /websites/RemoteBackupConfig/ --- plogical/IncScheduler.py | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/plogical/IncScheduler.py b/plogical/IncScheduler.py index b423c0656..5fb266505 100644 --- a/plogical/IncScheduler.py +++ b/plogical/IncScheduler.py @@ -1353,6 +1353,26 @@ Automatic backup failed for %s on %s. Backupobj.config = json.dumps(backupConfig) Backupobj.save() + #S3 retention + #Needs a conversion table, because strings are stored instead of ints + retention_conversion = { + "3 Days" : 259200, + "1 Week" : 604800, + "3 Weeks" : 1814400, + "1 Month" : 2629743 + } + retentionSeconds = retention_conversion[Scheduleobj.fileretention] + + bucket_obj = s3.Bucket(BucketName) + ts = time.time() + for file in bucket_obj.objects.all(): + result = float(ts - file.last_modified.timestamp()) + if result > retentionSeconds: + BackupLogs(owner=plan, level='INFO', timeStamp=time.strftime("%b %d %Y, %H:%M:%S"), + msg='File %s expired and deleted according to your retention settings.' % ( + file.key)).save() + file.delete() + except BaseException as msg: print("Version ID Error: %s"%str(msg)) except BaseException as msg: