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

Allow s3 backend to accept self-signed certs

Browse Source 
Fixes #316
This commit is contained in:
Girish Ramakrishnan
2017-10-05 10:01:09 -07:00
parent ba5645a20e
commit df6e6cb071
4 changed files with 20 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -152,6 +152,14 @@
<input type="text" class="form-control" ng-model="configureBackup.endpoint" id="inputConfigureBackupEndpoint" name="endpoint" ng-disabled="configureBackup.busy" placeholder="URL of Minio/S3 Compatible" ng-required="configureBackup.provider === 'minio' || configureBackup.provider === 's3-v4-compat'">
</div>
<div class="checkbox" ng-show="configureBackup.provider === 'minio' || configureBackup.provider === 's3-v4-compat'" >
<label>
<input type="checkbox" ng-model="configureBackup.acceptSelfSignedCerts" id="inputConfigureBackupSelfSigned">
Accept Self-signed certificate
</input>
</label>
</div>
<div class="form-group" ng-class="{ 'has-error': configureBackup.error.bucket }" ng-show="s3like(configureBackup.provider)">
<label class="control-label" for="inputConfigureBackupBucket">Bucket name</label>
<input type="text" class="form-control" ng-model="configureBackup.bucket" id="inputConfigureBackupBucket" name="bucket" ng-disabled="configureBackup.busy" ng-required="s3like(configureBackup.provider)">

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

@@ -327,6 +327,7 @@ angular.module('Application').controller('SettingsController', ['$scope', '$loca
endpoint: '',
backupFolder: '',
retentionSecs: -1,
acceptSelfSignedCerts: false,
format: 'tgz',
clearForm: function () {
@@ -339,6 +340,7 @@ angular.module('Application').controller('SettingsController', ['$scope', '$loca
$scope.configureBackup.backupFolder = '';
$scope.configureBackup.retentionSecs = -1;
$scope.configureBackup.format = 'tgz';
$scope.configureBackup.acceptSelfSignedCerts = false;
},
show: function () {
@@ -356,6 +358,7 @@ angular.module('Application').controller('SettingsController', ['$scope', '$loca
$scope.configureBackup.backupFolder = $scope.backupConfig.backupFolder;
$scope.configureBackup.retentionSecs = $scope.backupConfig.retentionSecs;
$scope.configureBackup.format = $scope.backupConfig.format;
$scope.configureBackup.acceptSelfSignedCerts = !!$scope.backupConfig.acceptSelfSignedCerts;
$('#configureBackupModal').modal('show');
},
@@ -384,6 +387,7 @@ angular.module('Application').controller('SettingsController', ['$scope', '$loca
if ($scope.configureBackup.region) backupConfig.region = $scope.configureBackup.region;
} else if (backupConfig.provider === 'minio' || backupConfig.provider === 's3-v4-compat') {
backupConfig.region = 'us-east-1';
backupConfig.acceptSelfSignedCerts = $scope.configureBackup.acceptSelfSignedCerts;
} else if (backupConfig.provider === 'exoscale-sos') {
backupConfig.endpoint = 'https://sos.exo.io';
backupConfig.region = 'us-east-1';