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

rename backupTargets to backupSites

Browse Source
This commit is contained in:
Girish Ramakrishnan
2025-09-12 09:48:37 +02:00
parent f8015c156e
commit c5b7264f1a
38 changed files with 751 additions and 751 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/apptask.js
+7 -7
View File
@@ -15,7 +15,7 @@ const apps = require('./apps.js'),
appstore = require('./appstore.js'),
assert = require('node:assert'),
AuditSource = require('./auditsource.js'),
backupTargets = require('./backuptargets.js'),
backupSites = require('./backupsites.js'),
backuptask = require('./backuptask.js'),
BoxError = require('./boxerror.js'),
constants = require('./constants.js'),
@@ -271,7 +271,7 @@ async function installCommand(app, args, progressCallback) {
assert.strictEqual(typeof args, 'object');
assert.strictEqual(typeof progressCallback, 'function');
// restoreConfig is one of null (install) OR { backupId } (restore) OR { remotePath, backupTarget } (import) OR { inPlace } (import)
// restoreConfig is one of null (install) OR { backupId } (restore) OR { remotePath, backupSite } (import) OR { inPlace } (import)
const { restoreConfig, overwriteDns, skipDnsSetup, oldManifest } = args;
// this protects against the theoretical possibility of an app being marked for install/restore from
@@ -334,11 +334,11 @@ async function installCommand(app, args, progressCallback) {
await progressCallback({ percent: 65, message: 'Downloading backup and restoring addons' });
await services.setupAddons(app, app.manifest.addons);
await services.clearAddons(app, app.manifest.addons);
const backupTarget = restoreConfig.backupTarget;
await backupTargets.storageApi(backupTarget).setup(backupTarget.config);
const backupSite = restoreConfig.backupSite;
await backupSites.storageApi(backupSite).setup(backupSite.config);
await backuptask.downloadApp(app, restoreConfig, (progress) => { progressCallback({ percent: 75, message: progress.message }); });
await apps.loadConfig(app);
await backupTargets.storageApi(backupTarget).teardown(backupTarget.config);
await backupSites.storageApi(backupSite).teardown(backupSite.config);
await progressCallback({ percent: 75, message: 'Restoring addons' });
await services.restoreAddons(app, app.manifest.addons);
} else { // clone and restore
@@ -566,9 +566,9 @@ async function updateCommand(app, args, progressCallback) {
if (!updateConfig.skipBackup) {
await progressCallback({ percent: 15, message: 'Backing up app' });
const backupTarget = await backupTargets.getPrimary();
const backupSite = await backupSites.getPrimary();
// preserve update backups for 3 weeks
const [error] = await safe(backuptask.backupApp(app, backupTarget, { preserveSecs: 3*7*24*60*60 }, (progress) => {
const [error] = await safe(backuptask.backupApp(app, backupSite, { preserveSecs: 3*7*24*60*60 }, (progress) => {
progressCallback({ percent: 15, message: `Backup - ${progress.message}` });
}));
if (error) {