From da06fcbb09b5f2bfcf58c53de8112450eeccf65b Mon Sep 17 00:00:00 2001 From: pappapisshu <39009553+pappapisshu@users.noreply.github.com> Date: Fri, 23 Dec 2022 13:39:12 +0100 Subject: [PATCH] No impact in case the region is not necessary For users who have been using mail-in-a-box from before version v60 and who do not need the region parameter in duplicity configuration, the backup continues to work without impacts. --- management/backup.py | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/management/backup.py b/management/backup.py index 17c27a9d..c1853d93 100755 --- a/management/backup.py +++ b/management/backup.py @@ -222,8 +222,18 @@ def get_duplicity_additional_args(env): from urllib.parse import urlsplit, urlunsplit target = urlsplit(config["target"]) endpoint_url = urlunsplit(("https", target.netloc, '', '', '')) - region = config["target_region"] - return ["--s3-endpoint-url", endpoint_url, "--s3-region-name", region] + + # The target_region parameter has been added since duplicity + # now requires it for most cases in which + # the S3-compatible service is not provided by AWS. + # Nevertheless, some users who use mail-in-a-box + # from before version v60 and who use AWS's S3 service + # may not have this parameter in the configuration. + if "target_region" in config: + region = config["target_region"] + return ["--s3-endpoint-url", endpoint_url, "--s3-region-name", region] + else: + return ["--s3-endpoint-url", endpoint_url] return []