From 544732efa3da660dbdc1249060aa6df7c7e1e0a3 Mon Sep 17 00:00:00 2001 From: Usman Nasir Date: Sun, 4 Apr 2021 16:33:36 +0500 Subject: [PATCH] delete non-existing site using the core function --- plogical/ClusterManager.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/plogical/ClusterManager.py b/plogical/ClusterManager.py index 43822ce36..396681f72 100644 --- a/plogical/ClusterManager.py +++ b/plogical/ClusterManager.py @@ -284,8 +284,6 @@ password=%s""" % (rootdbpassword, rootdbpassword) from plogical.acl import ACLManager import validators - from plogical.vhost import vhost - currentACL = ACLManager.loadedACL(1) allSite = ACLManager.findAllSites(currentACL, 1) @@ -296,7 +294,11 @@ password=%s""" % (rootdbpassword, rootdbpassword) self.PostStatus( 'Domain %s not found in Master, deleting data directories and configurations.' % (website)) - vhost.deleteVirtualHostConfigurations(website) + command = 'rm -rf /home/%s' % (website) + ProcessUtilities.normalExecutioner(command) + + command = 'rm -rf /%s/%s' % (ClusterManager.vhostConfPath, website) + ProcessUtilities.normalExecutioner(command) self.PostStatus('All domains synced.')