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

settings: move ipv6/ipv4 config into network

Browse Source 
this also rename sysinfo_config to ipv4_config
This commit is contained in:
Girish Ramakrishnan
2023-08-03 06:05:29 +05:30
parent f2e56cbdd8
commit 92a103d635
14 changed files with 144 additions and 139 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/provision.js
+11 -10
View File
@@ -20,6 +20,7 @@ const assert = require('assert'),
fs = require('fs'),
mail = require('./mail.js'),
mounts = require('./mounts.js'),
network = require('./network.js'),
reverseProxy = require('./reverseproxy.js'),
safe = require('safetydance'),
semver = require('semver'),
@@ -81,9 +82,9 @@ async function setupTask(domain, auditSource) {
gProvisionStatus.setup.active = false;
}
async function setup(domainConfig, sysinfoConfig, auditSource) {
async function setup(domainConfig, ipv4Config, auditSource) {
assert.strictEqual(typeof domainConfig, 'object');
assert.strictEqual(typeof sysinfoConfig, 'object');
assert.strictEqual(typeof ipv4Config, 'object');
assert.strictEqual(typeof auditSource, 'object');
if (gProvisionStatus.setup.active || gProvisionStatus.restore.active) throw new BoxError(BoxError.BAD_STATE, 'Already setting up or restoring');
@@ -112,7 +113,7 @@ async function setup(domainConfig, sysinfoConfig, auditSource) {
await settings.setMailLocation(domain, `${constants.DASHBOARD_SUBDOMAIN}.${domain}`); // default mail location. do this before we add the domain for upserting mail DNS
await domains.add(domain, data, auditSource);
await settings.setSysinfoConfig(sysinfoConfig);
await network.setIPv4Config(ipv4Config);
safe(setupTask(domain, auditSource), { debug }); // now that args are validated run the task in the background
} catch (error) {
@@ -151,10 +152,10 @@ async function activate(username, password, email, displayName, ip, auditSource)
};
}
async function restoreTask(backupConfig, remotePath, sysinfoConfig, options, auditSource) {
async function restoreTask(backupConfig, remotePath, ipv4Config, options, auditSource) {
assert.strictEqual(typeof backupConfig, 'object');
assert.strictEqual(typeof remotePath, 'string');
assert.strictEqual(typeof sysinfoConfig, 'object');
assert.strictEqual(typeof ipv4Config, 'object');
assert.strictEqual(typeof options, 'object');
assert.strictEqual(typeof auditSource, 'object');
@@ -169,7 +170,7 @@ async function restoreTask(backupConfig, remotePath, sysinfoConfig, options, aud
await backuptask.downloadMail(mailRestoreConfig, (progress) => setProgress('restore', progress.message));
await ensureDhparams();
await settings.setSysinfoConfig(sysinfoConfig);
await network.setIPv4Config(ipv4Config);
await reverseProxy.restoreFallbackCertificates();
const dashboardDomain = settings.dashboardDomain(); // load this fresh from after the backup.restore
@@ -186,11 +187,11 @@ async function restoreTask(backupConfig, remotePath, sysinfoConfig, options, aud
gProvisionStatus.restore.active = false;
}
async function restore(backupConfig, remotePath, version, sysinfoConfig, options, auditSource) {
async function restore(backupConfig, remotePath, version, ipv4Config, options, auditSource) {
assert.strictEqual(typeof backupConfig, 'object');
assert.strictEqual(typeof remotePath, 'string');
assert.strictEqual(typeof version, 'string');
assert.strictEqual(typeof sysinfoConfig, 'object');
assert.strictEqual(typeof ipv4Config, 'object');
assert.strictEqual(typeof options, 'object');
assert.strictEqual(typeof auditSource, 'object');
@@ -229,10 +230,10 @@ async function restore(backupConfig, remotePath, version, sysinfoConfig, options
backupConfig.encryption = null;
}
error = await sysinfo.testIPv4Config(sysinfoConfig);
error = await sysinfo.testIPv4Config(ipv4Config);
if (error) throw error;
safe(restoreTask(backupConfig, remotePath, sysinfoConfig, options, auditSource), { debug }); // now that args are validated run the task in the background
safe(restoreTask(backupConfig, remotePath, ipv4Config, options, auditSource), { debug }); // now that args are validated run the task in the background
} catch (error) {
gProvisionStatus.restore.active = false;
gProvisionStatus.restore.errorMessage = error ? error.message : '';