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

Support s3 backup upload without session tokens

Browse Source
This commit is contained in:
Johannes Zellner
2016-06-13 19:10:08 +02:00
parent c691b75344
commit ef200fcc85
3 changed files with 21 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/backups.js
View File

@@ -255,7 +255,8 @@ function backupBoxWithAppBackupIds(appBackupIds, callback) {
debug('backupBoxWithAppBackupIds: %j', result);
var args = [ result.s3Url, result.accessKeyId, result.secretAccessKey, result.sessionToken, result.region, result.backupKey ];
var args = [ result.s3Url, result.accessKeyId, result.secretAccessKey, result.region, result.backupKey ];
if (result.sessionToken) args.push(result.sessionToken);
shell.sudo('backupBox', [ BACKUP_BOX_CMD ].concat(args), function (error) {
if (error) return callback(new BackupsError(BackupsError.INTERNAL_ERROR, error));
@@ -321,8 +322,8 @@ function createNewAppBackup(app, manifest, callback) {
debugApp(app, 'createNewAppBackup: backup url:%s backup config url:%s', result.s3DataUrl, result.s3ConfigUrl);
var args = [ app.id, result.s3ConfigUrl, result.s3DataUrl, result.accessKeyId, result.secretAccessKey,
result.sessionToken, result.region, result.backupKey ];
var args = [ app.id, result.s3ConfigUrl, result.s3DataUrl, result.accessKeyId, result.secretAccessKey, result.region, result.backupKey ];
if (result.sessionToken) args.push(result.sessionToken);
async.series([
addons.backupAddons.bind(null, app, manifest.addons),