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

Fix backup mapping (mail dir has moved)

Browse Source
This commit is contained in:
Girish Ramakrishnan
2017-09-13 09:22:50 -07:00
parent ba9662f3fa
commit e78d976c8f
6 changed files with 18 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/storage/caas.js
View File

@@ -61,17 +61,17 @@ function getBackupFilePath(apiConfig, backupId) {
}
// storage api
function backup(apiConfig, backupId, sourceDirectories, callback) {
function backup(apiConfig, backupId, sourceDir, callback) {
assert.strictEqual(typeof apiConfig, 'object');
assert.strictEqual(typeof backupId, 'string');
assert(Array.isArray(sourceDirectories));
assert.strictEqual(typeof sourceDir, 'string');
assert.strictEqual(typeof callback, 'function');
callback = once(callback);
var backupFilePath = getBackupFilePath(apiConfig, backupId);
debug('[%s] backup: %j -> %s', backupId, sourceDirectories, backupFilePath);
debug('[%s] backup: %s -> %s', backupId, sourceDir, backupFilePath);
getBackupCredentials(apiConfig, function (error, credentials) {
if (error) return callback(error);
@@ -95,7 +95,7 @@ function backup(apiConfig, backupId, sourceDirectories, callback) {
callback(null);
});
targz.create(sourceDirectories, apiConfig.key || null, passThrough, callback);
targz.create([{ source: sourceDir, destination: '.' }], apiConfig.key || null, passThrough, callback);
});
}

8
src/storage/filesystem.js
View File

@@ -37,17 +37,17 @@ function getBackupFilePath(apiConfig, backupId) {
}
// storage api
function backup(apiConfig, backupId, sourceDirectories, callback) {
function backup(apiConfig, backupId, sourceDir, callback) {
assert.strictEqual(typeof apiConfig, 'object');
assert.strictEqual(typeof backupId, 'string');
assert(Array.isArray(sourceDirectories));
assert.strictEqual(typeof sourceDir, 'string');
assert.strictEqual(typeof callback, 'function');
callback = once(callback);
var backupFilePath = getBackupFilePath(apiConfig, backupId);
debug('[%s] backup: %j -> %s', backupId, sourceDirectories, backupFilePath);
debug('[%s] backup: %s -> %s', backupId, sourceDir, backupFilePath);
mkdirp(path.dirname(backupFilePath), function (error) {
if (error) return callback(new BackupsError(BackupsError.EXTERNAL_ERROR, error.message));
@@ -69,7 +69,7 @@ function backup(apiConfig, backupId, sourceDirectories, callback) {
callback(null);
});
targz.create(sourceDirectories, apiConfig.key || null, fileStream, callback);
targz.create([{ source: sourceDir, destination: '.' }], apiConfig.key || null, fileStream, callback);
});
}

4
src/storage/interface.js
View File

@@ -19,10 +19,10 @@ exports = module.exports = {
var assert = require('assert');
function backup(apiConfig, backupId, sourceDirectories, callback) {
function backup(apiConfig, backupId, sourceDir, callback) {
assert.strictEqual(typeof apiConfig, 'object');
assert.strictEqual(typeof backupId, 'string');
assert(Array.isArray(sourceDirectories));
assert.strictEqual(typeof sourceDir, 'string');
assert.strictEqual(typeof callback, 'function');
// Result: none

4
src/storage/noop.js
View File

@@ -14,10 +14,10 @@ exports = module.exports = {
var assert = require('assert'),
debug = require('debug')('box:storage/noop');
function backup(apiConfig, backupId, sourceDirectories, callback) {
function backup(apiConfig, backupId, sourceDir, callback) {
assert.strictEqual(typeof apiConfig, 'object');
assert.strictEqual(typeof backupId, 'string');
assert(Array.isArray(sourceDirectories));
assert.strictEqual(typeof sourceDir, 'string');
assert.strictEqual(typeof callback, 'function');
debug('backup: %s %j', backupId, sourceDirectories);

8
src/storage/s3.js
View File

@@ -66,17 +66,17 @@ function getBackupFilePath(apiConfig, backupId) {
}
// storage api
function backup(apiConfig, backupId, sourceDirectories, callback) {
function backup(apiConfig, backupId, sourceDir, callback) {
assert.strictEqual(typeof apiConfig, 'object');
assert.strictEqual(typeof backupId, 'string');
assert(Array.isArray(sourceDirectories));
assert.strictEqual(typeof sourceDir, 'string');
assert.strictEqual(typeof callback, 'function');
callback = once(callback);
var backupFilePath = getBackupFilePath(apiConfig, backupId);
debug('[%s] backup: %j -> %s', backupId, sourceDirectories, backupFilePath);
debug('[%s] backup: %s -> %s', backupId, sourceDir, backupFilePath);
getBackupCredentials(apiConfig, function (error, credentials) {
if (error) return callback(error);
@@ -100,7 +100,7 @@ function backup(apiConfig, backupId, sourceDirectories, callback) {
callback(null);
});
targz.create(sourceDirectories, apiConfig.key || null, passThrough, callback);
targz.create([{ source: sourceDir, destination: '.' }], apiConfig.key || null, passThrough, callback);
});
}