loading parent data

This commit is contained in:
David Edwards
2023-12-08 16:11:19 -07:00
parent 20d513f224
commit 7a35419dd5
2 changed files with 11 additions and 2 deletions

View File

@@ -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):

View File

@@ -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)):