From 4e8a7cc5c3e41bc806be4eacb746ddae022168a7 Mon Sep 17 00:00:00 2001 From: Usman Nasir Date: Thu, 5 Mar 2020 15:20:22 +0500 Subject: [PATCH] bug fix: delete linux user upon website deletion --- plogical/vhost.py | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/plogical/vhost.py b/plogical/vhost.py index ee0828cb1..dd5bf50fc 100755 --- a/plogical/vhost.py +++ b/plogical/vhost.py @@ -349,6 +349,7 @@ class vhost: vhost.deleteCoreConf(virtualHostName, numberOfSites) delWebsite = Websites.objects.get(domain=virtualHostName) + externalApp = delWebsite.externalApp ## @@ -376,8 +377,16 @@ class vhost: ## Delete mail accounts - command = "sudo rm -rf /home/vmail/" + virtualHostName + command = "rm -rf /home/vmail/" + virtualHostName subprocess.call(shlex.split(command)) + + if ProcessUtilities.decideDistro() == ProcessUtilities.centos: + command = 'userdel %s' % (externalApp) + else: + command = 'deluser %s' % (externalApp) + + ProcessUtilities.executioner(command) + except BaseException as msg: logging.CyberCPLogFileWriter.writeToFile(str(msg) + " [Not able to remove virtual host configuration from main configuration file.]") return 0