haeaeae/duplicati
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge commit '29f1d2c3cbb27ff1c1d205abc7d2f81ed51cb894' into release/2.0.6.2_experimental

Browse Source
This commit is contained in:
Kenneth Skovhede
2021-05-29 12:34:54 +02:00
parent fe99e8179e 29f1d2c3cb
commit b8d0b6d794
2 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Duplicati/Library/Backend/AzureBlob/AzureBlobBackend.cs
+8 -4
View File
@@ -53,10 +53,14 @@ namespace Duplicati.Library.Backend.AzureBlob
storageAccountName = options["auth-username"];
if (options.ContainsKey("auth-password"))
accessKey = options["auth-password"];
if (options.ContainsKey("azure_account_name") || options.ContainsKey("azure-account-name"))
storageAccountName = options["azure_account_name"] ?? options["azure-account-name"];
if (options.ContainsKey("azure_access_key") || options.ContainsKey("azure-access-key"))
accessKey = options["azure_access_key"] ?? options["azure-access-key"];
if (options.ContainsKey("azure_account_name"))
storageAccountName = options["azure_account_name"];
if (options.ContainsKey("azure-account-name"))
storageAccountName = options["azure-account-name"];
if (options.ContainsKey("azure_access_key"))
accessKey = options["azure_access_key"];
if (options.ContainsKey("azure-access-key"))
accessKey = options["azure-access-key"];
if (!string.IsNullOrEmpty(uri.Username))
storageAccountName = uri.Username;
if (!string.IsNullOrEmpty(uri.Password))
Duplicati/Library/Backend/S3/S3Backend.cs
+8 -4
View File
@@ -185,10 +185,14 @@ namespace Duplicati.Library.Backend
if (options.ContainsKey("auth-password"))
awsKey = options["auth-password"];
if (options.ContainsKey("aws_access_key_id") || options.ContainsKey("aws-access-key-id"))
awsID = options["aws_access_key_id"] ?? options["aws-access-key-id"];
if (options.ContainsKey("aws_secret_access_key") || options.ContainsKey("aws-secret-access-key"))
awsKey = options["aws_secret_access_key"] ?? options["aws-secret-access-key"];
if (options.ContainsKey("aws_access_key_id"))
awsID = options["aws_access_key_id"];
if (options.ContainsKey("aws-access-key-id"))
awsID = options["aws-access-key-id"];
if (options.ContainsKey("aws_secret_access_key"))
awsKey = options["aws_secret_access_key"];
if (options.ContainsKey("aws-secret-access-key"))
awsKey = options["aws-secret-access-key"];
if (!string.IsNullOrEmpty(uri.Username))
awsID = uri.Username;
if (!string.IsNullOrEmpty(uri.Password))