diff --git a/src/js/restore.js b/src/js/restore.js index fdc19bb77..afc01de2d 100644 --- a/src/js/restore.js +++ b/src/js/restore.js @@ -118,7 +118,8 @@ app.controller('RestoreController', ['$scope', 'Client', function ($scope, Clien $scope.wasabiRegions = [ { name: 'EU Central 1', value: 'https://s3.eu-central-1.wasabisys.com' }, - { name: 'US East 1', value: 'https://s3.wasabisys.com' }, + { name: 'US East 1', value: 'https://s3.us-east-1.wasabisys.com' }, + { name: 'US East 2', value: 'https://s3.us-east-2.wasabisys.com ' }, { name: 'US West 1', value: 'https://s3.us-west-1.wasabisys.com' } ]; @@ -176,7 +177,7 @@ app.controller('RestoreController', ['$scope', 'Client', function ($scope, Clien backupConfig.region = 'us-east-1'; backupConfig.signatureVersion = 'v4'; } else if (backupConfig.provider === 'wasabi') { - backupConfig.region = 'us-east-1'; + backupConfig.region = $scope.wasabiRegions.find(function (x) { return x.value === $scope.endpoint; }).region; backupConfig.signatureVersion = 'v4'; } else if (backupConfig.provider === 'scaleway-objectstorage') { backupConfig.region = $scope.scalewayRegions.find(function (x) { return x.value === $scope.endpoint; }).region; diff --git a/src/views/app.js b/src/views/app.js index 7988b84e3..dfe6e724f 100644 --- a/src/views/app.js +++ b/src/views/app.js @@ -37,7 +37,8 @@ angular.module('Application').controller('AppController', ['$scope', '$location' $scope.wasabiRegions = [ { name: 'EU Central 1', value: 'https://s3.eu-central-1.wasabisys.com' }, - { name: 'US East 1', value: 'https://s3.wasabisys.com' }, + { name: 'US East 1', value: 'https://s3.us-east-1.wasabisys.com' }, + { name: 'US East 2', value: 'https://s3.us-east-2.wasabisys.com ' }, { name: 'US West 1', value: 'https://s3.us-west-1.wasabisys.com' } ]; @@ -936,7 +937,7 @@ angular.module('Application').controller('AppController', ['$scope', '$location' backupConfig.region = 'us-east-1'; backupConfig.signatureVersion = 'v4'; } else if (backupConfig.provider === 'wasabi') { - backupConfig.region = 'us-east-1'; + backupConfig.region = $scope.wasabiRegions.find(function (x) { return x.value === $scope.importBackup.endpoint; }).region; backupConfig.signatureVersion = 'v4'; } else if (backupConfig.provider === 'scaleway-objectstorage') { backupConfig.region = $scope.scalewayRegions.find(function (x) { return x.value === $scope.importBackup.endpoint; }).region; diff --git a/src/views/backups.js b/src/views/backups.js index fcc2542d1..c0fd1f235 100644 --- a/src/views/backups.js +++ b/src/views/backups.js @@ -38,7 +38,8 @@ angular.module('Application').controller('BackupsController', ['$scope', '$locat $scope.wasabiRegions = [ { name: 'EU Central 1', value: 'https://s3.eu-central-1.wasabisys.com' }, - { name: 'US East 1', value: 'https://s3.wasabisys.com' }, + { name: 'US East 1', value: 'https://s3.us-east-1.wasabisys.com' }, + { name: 'US East 2', value: 'https://s3.us-east-2.wasabisys.com ' }, { name: 'US West 1', value: 'https://s3.us-west-1.wasabisys.com' } ]; @@ -359,7 +360,7 @@ angular.module('Application').controller('BackupsController', ['$scope', '$locat backupConfig.region = 'us-east-1'; backupConfig.signatureVersion = 'v4'; } else if (backupConfig.provider === 'wasabi') { - backupConfig.region = 'us-east-1'; + backupConfig.region = $scope.wasabiRegions.find(function (x) { return x.value === $scope.configureBackup.endpoint; }).region; backupConfig.signatureVersion = 'v4'; } else if (backupConfig.provider === 'scaleway-objectstorage') { backupConfig.region = $scope.scalewayRegions.find(function (x) { return x.value === $scope.configureBackup.endpoint; }).region;