rename backups to backuptargets
This commit is contained in:
+7
-7
@@ -9,7 +9,7 @@ exports = module.exports = {
|
||||
|
||||
const appstore = require('./appstore.js'),
|
||||
assert = require('assert'),
|
||||
backups = require('./backups.js'),
|
||||
backupTargets = require('./backuptargets.js'),
|
||||
backupListing = require('./backuplisting.js'),
|
||||
backuptask = require('./backuptask.js'),
|
||||
BoxError = require('./boxerror.js'),
|
||||
@@ -181,7 +181,7 @@ async function restoreTask(backupConfig, remotePath, ipv4Config, ipv6Config, opt
|
||||
|
||||
try {
|
||||
setProgress('restore', 'Downloading box backup');
|
||||
backupConfig.rootPath = backups.getRootPath(backupConfig, paths.MANAGED_BACKUP_MOUNT_DIR);
|
||||
backupConfig.rootPath = backupTargets.getRootPath(backupConfig, paths.MANAGED_BACKUP_MOUNT_DIR);
|
||||
await backuptask.restore(backupConfig, remotePath, (progress) => setProgress('restore', progress.message));
|
||||
|
||||
setProgress('restore', 'Downloading mail backup');
|
||||
@@ -204,7 +204,7 @@ async function restoreTask(backupConfig, remotePath, ipv4Config, ipv6Config, opt
|
||||
await dashboard.setupLocation(location.subdomain, location.domain, auditSource);
|
||||
|
||||
delete backupConfig.rootPath;
|
||||
await backups.setConfig(backupConfig);
|
||||
await backupTargets.setConfig(backupConfig);
|
||||
await eventlog.add(eventlog.ACTION_RESTORE, auditSource, { remotePath });
|
||||
|
||||
setImmediate(() => safe(platform.onActivated({ skipDnsSetup: options.skipDnsSetup }), { debug }));
|
||||
@@ -235,18 +235,18 @@ async function restore(backupConfig, remotePath, version, ipv4Config, ipv6Config
|
||||
const activated = await users.isActivated();
|
||||
if (activated) throw new BoxError(BoxError.CONFLICT, 'Already activated. Restore with a fresh Cloudron installation.');
|
||||
|
||||
let error = backups.validateFormat(backupConfig.format);
|
||||
let error = backupTargets.validateFormat(backupConfig.format);
|
||||
if (error) throw error;
|
||||
|
||||
if ('password' in backupConfig) {
|
||||
backupConfig.encryption = backups.generateEncryptionKeysSync(backupConfig.password);
|
||||
backupConfig.encryption = backupTargets.generateEncryptionKeysSync(backupConfig.password);
|
||||
delete backupConfig.password;
|
||||
} else {
|
||||
backupConfig.encryption = null;
|
||||
}
|
||||
|
||||
await backups.setupManagedStorage(backupConfig, paths.MANAGED_BACKUP_MOUNT_DIR); // this validates mountOptions
|
||||
error = await backups.testStorage(Object.assign({ mountPath: paths.MANAGED_BACKUP_MOUNT_DIR }, backupConfig)); // this validates provider and it's api options. requires mountPath
|
||||
await backupTargets.setupManagedStorage(backupConfig, paths.MANAGED_BACKUP_MOUNT_DIR); // this validates mountOptions
|
||||
error = await backupTargets.testStorage(Object.assign({ mountPath: paths.MANAGED_BACKUP_MOUNT_DIR }, backupConfig)); // this validates provider and it's api options. requires mountPath
|
||||
if (error) throw error;
|
||||
|
||||
error = await network.testIPv4Config(ipv4Config);
|
||||
|
||||
Reference in New Issue
Block a user