From d56afe374295052474000a79c7ac39fe4b70a602 Mon Sep 17 00:00:00 2001 From: Wildan M Date: Thu, 14 Dec 2023 05:27:35 +0700 Subject: [PATCH] Kill processes before delete domain --- package-lock.json | 4 ++-- package.json | 2 +- src/executor/runner.js | 4 +++- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index cacbbab..dd69cc4 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "domcloud-bridge", - "version": "0.33.0", + "version": "0.34.3", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "domcloud-bridge", - "version": "0.33.0", + "version": "0.34.3", "license": "MIT", "dependencies": { "axios": "^1.6.2", diff --git a/package.json b/package.json index faa62ce..c967f7b 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "domcloud-bridge", - "version": "0.34.2", + "version": "0.34.3", "description": "Deployment runner for DOM Cloud", "main": "app.js", "engines": { diff --git a/src/executor/runner.js b/src/executor/runner.js index 25aef64..5385d05 100644 --- a/src/executor/runner.js +++ b/src/executor/runner.js @@ -246,9 +246,11 @@ export default async function runConfig(config, domain, writer, sandbox = false) }); break; case 'delete': + const user = domaindata['Username']; await writeLog("$> virtualmin delete-domain"); + await spawnSudoUtil('SHELL_SUDO', [user, 'killall', '-u' , user]); await virtExec("delete-domain", value, { - user: domaindata['Username'], + user, }); await spawnSudoUtil('PHPFPM_CLEAN', domaindata['ID']); // no need to do other stuff