From 7a35419dd524927ada8f218161b957f2fb7cc6c6 Mon Sep 17 00:00:00 2001 From: David Edwards Date: Fri, 8 Dec 2023 16:11:19 -0700 Subject: [PATCH] loading parent data --- wo/cli/plugins/site_create.py | 8 ++++++-- wo/cli/plugins/site_functions.py | 5 +++++ 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/wo/cli/plugins/site_create.py b/wo/cli/plugins/site_create.py index 8a922cf..03ecb8b 100644 --- a/wo/cli/plugins/site_create.py +++ b/wo/cli/plugins/site_create.py @@ -7,7 +7,7 @@ from wo.cli.plugins.site_functions import ( doCleanupAction, setupdatabase, setupwordpress, setwebrootpermissions, display_cache_settings, copyWildcardCert) from wo.cli.plugins.sitedb import (addNewSite, deleteSiteInfo, - updateSiteInfo) + updateSiteInfo, getSiteInfo) from wo.core.acme import WOAcme from wo.core.domainvalidate import WODomain from wo.core.git import WOGit @@ -196,14 +196,18 @@ class WOSiteCreateController(CementBaseController): data['basic'] = True if stype == 'subsite': + # Get parent site data + data = getSiteInfo(self, subsite_name) data = dict( site_name=wo_domain, www_domain=wo_www_domain, static=True, basic=False, wp=False, wpfc=False, wpsc=False, wprocket=False, wpce=False, multisite=False, wpsubdir=False, webroot=wo_site_webroot) + data["site_name"] = wo_domain + data["www_domain"] = wo_www_domain data['subsite'] = True data['subsite_name'] = subsite_name - data['basic'] = True + if (pargs.php72 or pargs.php73 or pargs.php74 or pargs.php80 or pargs.php81 or pargs.php82 or pargs.php83): diff --git a/wo/cli/plugins/site_functions.py b/wo/cli/plugins/site_functions.py index a32977f..a6ab1e2 100644 --- a/wo/cli/plugins/site_functions.py +++ b/wo/cli/plugins/site_functions.py @@ -67,6 +67,11 @@ def setupdomain(self, data): wo_domain_name = data['site_name'] wo_site_webroot = data['webroot'] + if 'subsite' in data.keys() and data['subsite']: + wo_parent_site = data["subsite_name"] + wo_parent_info = getSiteInfo(wo_parent_site) + data["webroot"] = wo_parent_info["webroot"] + # Check if nginx configuration already exists # if os.path.isfile('/etc/nginx/sites-available/{0}' # .format(wo_domain_name)):