jjkiers/cloudron-box
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Allow to setup a backup region

Browse Source
This commit is contained in:
Johannes Zellner
2016-10-11 14:20:31 +02:00
parent b30300b8b2
commit 0c85f96b27
2 changed files with 17 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
webadmin/src/views/settings.html
View File

@@ -134,6 +134,11 @@
<input type="text" class="form-control" ng-model="configureBackup.prefix" id="inputConfigureBackupPrefix" name="prefix" ng-disabled="configureBackup.busy" required>
</div>
<div class="form-group" ng-class="{ 'has-error': configureBackup.error.region }">
<label class="control-label" for="inputConfigureBackupRegion">Region</label>
<input type="text" class="form-control" ng-model="configureBackup.region" id="inputConfigureBackupPrefix" name="region" ng-disabled="configureBackup.busy" placeholder="us-east-1">
</div>
<div class="form-group" ng-class="{ 'has-error': configureBackup.error.accessKeyId }">
<label class="control-label" for="inputConfigureBackupAccessKeyId">Access Key Id</label>
<input type="text" class="form-control" ng-model="configureBackup.accessKeyId" id="inputConfigureBackupAccessKeyId" name="accessKeyId" ng-disabled="configureBackup.busy" required>

12
webadmin/src/views/settings.js
View File

@@ -257,6 +257,7 @@ angular.module('Application').controller('SettingsController', ['$scope', '$loca
prefix: '',
accessKeyId: '',
secretAccessKey: '',
region: '',
show: function () {
$scope.configureBackup.error = {};
@@ -264,6 +265,7 @@ angular.module('Application').controller('SettingsController', ['$scope', '$loca
$scope.configureBackup.bucket = $scope.backupConfig.bucket;
$scope.configureBackup.prefix = $scope.backupConfig.prefix;
$scope.configureBackup.region = $scope.backupConfig.region;
$scope.configureBackup.accessKeyId = $scope.backupConfig.accessKeyId;
$scope.configureBackup.secretAccessKey = $scope.backupConfig.secretAccessKey;
@@ -282,6 +284,8 @@ angular.module('Application').controller('SettingsController', ['$scope', '$loca
secretAccessKey: $scope.configureBackup.secretAccessKey
};
if ($scope.configureBackup.region) backupConfig.region = $scope.configureBackup.region;
Client.setBackupConfig(backupConfig, function (error) {
$scope.configureBackup.busy = false;
@@ -304,6 +308,12 @@ angular.module('Application').controller('SettingsController', ['$scope', '$loca
$scope.configureBackup.bucket = '';
$scope.configureBackupForm.bucket.$setPristine();
$('#inputConfigureBackupBucket').focus();
} else if (error.message.indexOf('ECONNREFUSED') !== -1) {
$scope.configureBackup.error.generic = 'Unknown region';
$scope.configureBackup.error.region = true;
$scope.configureBackup.region = '';
$scope.configureBackupForm.region.$setPristine();
$('#inputConfigureBackupRegion').focus();
} else {
$('#inputConfigureBackupBucket').focus();
}
@@ -317,7 +327,9 @@ angular.module('Application').controller('SettingsController', ['$scope', '$loca
// $scope.configureBackup.reset();
$('#configureBackupModal').modal('hide');
// now refresh the ui
Client.refreshConfig();
getBackupConfig();
});
}
};