diff --git a/plogical/ClusterManager.py b/plogical/ClusterManager.py index ca19a5ebf..b2060d036 100644 --- a/plogical/ClusterManager.py +++ b/plogical/ClusterManager.py @@ -283,12 +283,15 @@ password=%s""" % (rootdbpassword, rootdbpassword) ## Cleanup of deleted domains from plogical.acl import ACLManager + import validators currentACL = ACLManager.loadedACL(1) allSite = ACLManager.findAllSites(currentACL, 1) - for website in os.listdir('/home'): + for website in os.listdir(ClusterManager.vhostConfPath): + if website not in allSite: - self.PostStatus('Domain %s not found in Master, deleting data directories and configurations.' % (website)) + self.PostStatus( + 'Domain %s not found in Master, deleting data directories and configurations.' % (website)) command = 'rm -rf /home/%s' % (website) ProcessUtilities.normalExecutioner(command)