From c409d442465c7eba1cd650494226aa6afb0e5f2f Mon Sep 17 00:00:00 2001 From: VirtuBox Date: Mon, 9 Dec 2019 13:56:00 +0100 Subject: [PATCH] Cleanup site imports --- wo/cli/plugins/site.py | 5 +++-- wo/cli/plugins/site_create.py | 6 +++++- wo/cli/plugins/site_update.py | 8 +++++++- 3 files changed, 15 insertions(+), 4 deletions(-) diff --git a/wo/cli/plugins/site.py b/wo/cli/plugins/site.py index 426c84a..31d7968 100644 --- a/wo/cli/plugins/site.py +++ b/wo/cli/plugins/site.py @@ -3,8 +3,9 @@ import os import subprocess from cement.core.controller import CementBaseController, expose -from wo.cli.plugins.site_functions import * -from wo.cli.plugins.sitedb import (addNewSite, deleteSiteInfo, getAllsites, +from wo.cli.plugins.site_functions import ( + check_domain_exists, deleteDB, deleteWebRoot, removeNginxConf, logwatch) +from wo.cli.plugins.sitedb import (deleteSiteInfo, getAllsites, getSiteInfo, updateSiteInfo) from wo.cli.plugins.site_create import WOSiteCreateController from wo.cli.plugins.site_update import WOSiteUpdateController diff --git a/wo/cli/plugins/site_create.py b/wo/cli/plugins/site_create.py index 6152d2c..71bff0f 100644 --- a/wo/cli/plugins/site_create.py +++ b/wo/cli/plugins/site_create.py @@ -1,7 +1,11 @@ import os from cement.core.controller import CementBaseController, expose -from wo.cli.plugins.site_functions import * +from wo.cli.plugins.site_functions import ( + detSitePar, check_domain_exists, site_package_check, + pre_run_checks, setupdomain, SiteError, + doCleanupAction, setupdatabase, setupwordpress, setwebrootpermissions, + display_cache_settings, copyWildcardCert) from wo.cli.plugins.sitedb import (addNewSite, deleteSiteInfo, updateSiteInfo) from wo.core.acme import WOAcme diff --git a/wo/cli/plugins/site_update.py b/wo/cli/plugins/site_update.py index d602983..25b918f 100644 --- a/wo/cli/plugins/site_update.py +++ b/wo/cli/plugins/site_update.py @@ -4,7 +4,13 @@ import os from cement.core.controller import CementBaseController, expose -from wo.cli.plugins.site_functions import * +from wo.cli.plugins.site_functions import ( + detSitePar, site_package_check, + pre_run_checks, setupdomain, SiteError, + setupdatabase, setupwordpress, setwebrootpermissions, + display_cache_settings, copyWildcardCert, + updatewpuserpassword, setupngxblocker, setupwp_plugin, + setupwordpressnetwork, installwp_plugin, sitebackup, uninstallwp_plugin) from wo.cli.plugins.sitedb import (getAllsites, getSiteInfo, updateSiteInfo) from wo.core.acme import WOAcme