From 8ade3abe8c34fd3ff8be78640772e1a56644930b Mon Sep 17 00:00:00 2001 From: linitio Date: Tue, 14 Jun 2022 16:17:16 +0200 Subject: [PATCH 1/3] Add all Infomaniak clusters Swiss Backup & Public Cloud --- Duplicati/Library/Backend/OpenStack/OpenStackStorage.cs | 5 ++++- Duplicati/Library/Backend/S3/S3Backend.cs | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/Duplicati/Library/Backend/OpenStack/OpenStackStorage.cs b/Duplicati/Library/Backend/OpenStack/OpenStackStorage.cs index d2c995d37..2a55076d3 100644 --- a/Duplicati/Library/Backend/OpenStack/OpenStackStorage.cs +++ b/Duplicati/Library/Backend/OpenStack/OpenStackStorage.cs @@ -68,7 +68,10 @@ namespace Duplicati.Library.Backend.OpenStack new KeyValuePair("OVH Cloud Storage", "https://auth.cloud.ovh.net/v3"), new KeyValuePair("Selectel Cloud Storage", "https://auth.selcdn.ru"), new KeyValuePair("Memset Cloud Storage", "https://auth.storage.memset.com"), - new KeyValuePair("Infomaniak Swiss Backup", "https://swiss-backup02.infomaniak.com/identity/v3"), + new KeyValuePair("Infomaniak Swiss Backup cluster 1", "https://swiss-backup.infomaniak.com/identity/v3"), + new KeyValuePair("Infomaniak Swiss Backup cluster 2", "https://swiss-backup02.infomaniak.com/identity/v3"), + new KeyValuePair("Infomaniak Swiss Backup cluster 3", "https://swiss-backup03.infomaniak.com/identity/v3"), + new KeyValuePair("Infomaniak Public Cloud 1", "https://api.pub1.infomaniak.cloud/identity/v3"), }; public static readonly KeyValuePair[] OPENSTACK_VERSIONS = { diff --git a/Duplicati/Library/Backend/S3/S3Backend.cs b/Duplicati/Library/Backend/S3/S3Backend.cs index 881a47e14..5e5d9b8c5 100644 --- a/Duplicati/Library/Backend/S3/S3Backend.cs +++ b/Duplicati/Library/Backend/S3/S3Backend.cs @@ -56,7 +56,10 @@ namespace Duplicati.Library.Backend { "Wasabi Hot Storage", "s3.wasabisys.com" }, { "Wasabi Hot Storage (US West)", "s3.us-west-1.wasabisys.com" }, { "Wasabi Hot Storage (EU Central)", "s3.eu-central-1.wasabisys.com" }, - { "Infomaniak Swiss Backup", "s3.swiss-backup02.infomaniak.com" }, + { "Infomaniak Swiss Backup cluster 1", "s3.swiss-backup.infomaniak.com" }, + { "Infomaniak Swiss Backup cluster 2", "s3.swiss-backup02.infomaniak.com" }, + { "Infomaniak Swiss Backup cluster 3", "s3.swiss-backup03.infomaniak.com" }, + { "Infomaniak Public Cloud 1", "s3.pub1.infomaniak.cloud" }, }; //Updated list: http://docs.amazonwebservices.com/general/latest/gr/rande.html#s3_region From 7560a65f04a16a4c5aa6c64e7ad4b34edb69bf27 Mon Sep 17 00:00:00 2001 From: linitio Date: Tue, 14 Jun 2022 16:20:29 +0200 Subject: [PATCH 2/3] Add all Infomaniak clusters Swiss Backup & Public Cloud --- Duplicati/Library/Backend/OpenStack/OpenStackStorage.cs | 6 +++--- Duplicati/Library/Backend/S3/S3Backend.cs | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Duplicati/Library/Backend/OpenStack/OpenStackStorage.cs b/Duplicati/Library/Backend/OpenStack/OpenStackStorage.cs index 2a55076d3..f4afda942 100644 --- a/Duplicati/Library/Backend/OpenStack/OpenStackStorage.cs +++ b/Duplicati/Library/Backend/OpenStack/OpenStackStorage.cs @@ -69,9 +69,9 @@ namespace Duplicati.Library.Backend.OpenStack new KeyValuePair("Selectel Cloud Storage", "https://auth.selcdn.ru"), new KeyValuePair("Memset Cloud Storage", "https://auth.storage.memset.com"), new KeyValuePair("Infomaniak Swiss Backup cluster 1", "https://swiss-backup.infomaniak.com/identity/v3"), - new KeyValuePair("Infomaniak Swiss Backup cluster 2", "https://swiss-backup02.infomaniak.com/identity/v3"), - new KeyValuePair("Infomaniak Swiss Backup cluster 3", "https://swiss-backup03.infomaniak.com/identity/v3"), - new KeyValuePair("Infomaniak Public Cloud 1", "https://api.pub1.infomaniak.cloud/identity/v3"), + new KeyValuePair("Infomaniak Swiss Backup cluster 2", "https://swiss-backup02.infomaniak.com/identity/v3"), + new KeyValuePair("Infomaniak Swiss Backup cluster 3", "https://swiss-backup03.infomaniak.com/identity/v3"), + new KeyValuePair("Infomaniak Public Cloud 1", "https://api.pub1.infomaniak.cloud/identity/v3"), }; public static readonly KeyValuePair[] OPENSTACK_VERSIONS = { diff --git a/Duplicati/Library/Backend/S3/S3Backend.cs b/Duplicati/Library/Backend/S3/S3Backend.cs index 5e5d9b8c5..add57b5b4 100644 --- a/Duplicati/Library/Backend/S3/S3Backend.cs +++ b/Duplicati/Library/Backend/S3/S3Backend.cs @@ -57,9 +57,9 @@ namespace Duplicati.Library.Backend { "Wasabi Hot Storage (US West)", "s3.us-west-1.wasabisys.com" }, { "Wasabi Hot Storage (EU Central)", "s3.eu-central-1.wasabisys.com" }, { "Infomaniak Swiss Backup cluster 1", "s3.swiss-backup.infomaniak.com" }, - { "Infomaniak Swiss Backup cluster 2", "s3.swiss-backup02.infomaniak.com" }, - { "Infomaniak Swiss Backup cluster 3", "s3.swiss-backup03.infomaniak.com" }, - { "Infomaniak Public Cloud 1", "s3.pub1.infomaniak.cloud" }, + { "Infomaniak Swiss Backup cluster 2", "s3.swiss-backup02.infomaniak.com" } + { "Infomaniak Swiss Backup cluster 3", "s3.swiss-backup03.infomaniak.com" }, + { "Infomaniak Public Cloud 1", "s3.pub1.infomaniak.cloud" }, }; //Updated list: http://docs.amazonwebservices.com/general/latest/gr/rande.html#s3_region From 1ee2214b8dfd04ee8282aff69a7558ad8ff43378 Mon Sep 17 00:00:00 2001 From: linitio Date: Tue, 14 Jun 2022 16:34:36 +0200 Subject: [PATCH 3/3] FIx missing ',' on S3Backend.cs --- Duplicati/Library/Backend/S3/S3Backend.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Duplicati/Library/Backend/S3/S3Backend.cs b/Duplicati/Library/Backend/S3/S3Backend.cs index add57b5b4..009f80676 100644 --- a/Duplicati/Library/Backend/S3/S3Backend.cs +++ b/Duplicati/Library/Backend/S3/S3Backend.cs @@ -57,7 +57,7 @@ namespace Duplicati.Library.Backend { "Wasabi Hot Storage (US West)", "s3.us-west-1.wasabisys.com" }, { "Wasabi Hot Storage (EU Central)", "s3.eu-central-1.wasabisys.com" }, { "Infomaniak Swiss Backup cluster 1", "s3.swiss-backup.infomaniak.com" }, - { "Infomaniak Swiss Backup cluster 2", "s3.swiss-backup02.infomaniak.com" } + { "Infomaniak Swiss Backup cluster 2", "s3.swiss-backup02.infomaniak.com" }, { "Infomaniak Swiss Backup cluster 3", "s3.swiss-backup03.infomaniak.com" }, { "Infomaniak Public Cloud 1", "s3.pub1.infomaniak.cloud" }, };