Fix restore

domcloud · Aug 24, 2024 · 367bde4 · 367bde4
1 parent 3ab7aaa
commit 367bde4
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/src/executor/runner.js b/src/executor/runner.js
@@ -236,8 +236,11 @@ export default async function runConfig(config, domain, writer, sandbox = false)
                         await writeLog("$> virtualmin restore-domain");
                         await virtExec("restore-domain", value, {
                             domain,
+                            option: (!value.feature || !value.feature.includes('home')) ? [['dir', 'delete', '1']] : false,
+                            'fix': true,
                             'reuid': true,
                             'skip-warnings': true,
+                            'all-features': !value.feature,
                         });
                         break;
                     case 'delete':

diff --git a/src/executor/virtualmin.js b/src/executor/virtualmin.js
@@ -134,7 +134,11 @@ class VirtualminExecutor {
                         p.push(escapeShell(k));
                     else if (Array.isArray(v))
                         v.forEach(e => {
-                            p.push(escapeShell(k), escapeShell(e));
+                            if (Array.isArray(e)) {
+                                p.push(escapeShell(k), ...e.map(ee => escapeShell(ee)));
+                            } else {
+                                p.push(escapeShell(k), escapeShell(e));
+                            }
                         });
                     else
                         p.push(escapeShell(k), escapeShell(v));