Malin/WPIQ
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactor site create

Browse Source
This commit is contained in:
VirtuBox
2023-08-06 08:38:10 +02:00
parent 41d8299f2d
commit 717cdf8542
2 changed files with 19 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

79
wo/cli/plugins/site_create.py
View File

@@ -218,57 +218,27 @@ class WOSiteCreateController(CementBaseController):
else:
pass
data['php73'] = False
data['php74'] = False
data['php72'] = False
data['php80'] = False
data['php81'] = False
data['php82'] = False
if data and pargs.php73:
data['php73'] = True
data['wo_php'] = 'php73'
elif data and pargs.php74:
data['php74'] = True
data['wo_php'] = 'php74'
elif data and pargs.php72:
data['php72'] = True
data['wo_php'] = 'php72'
elif data and pargs.php80:
data['php80'] = True
data['wo_php'] = 'php80'
elif data and pargs.php81:
data['php81'] = True
data['wo_php'] = 'php81'
elif data and pargs.php82:
data['php82'] = True
data['wo_php'] = 'php82'
# Initialize all PHP versions to False
for version in WOVar.wo_php_versions:
data[version] = False
# Check for PHP versions in pargs
for pargs_version, version in WOVar.wo_php_versions.items():
if data and getattr(pargs, pargs_version, False):
data[pargs_version] = True
data['wo_php'] = pargs_version
php_version = version
break
else:
if self.app.config.has_section('php'):
config_php_ver = self.app.config.get(
'php', 'version')
if config_php_ver == '7.2':
data['php72'] = True
data['wo_php'] = 'php72'
elif config_php_ver == '7.3':
data['php73'] = True
data['wo_php'] = 'php73'
elif config_php_ver == '7.4':
data['php74'] = True
data['wo_php'] = 'php74'
elif config_php_ver == '8.0':
data['php80'] = True
data['wo_php'] = 'php80'
elif config_php_ver == '8.1':
data['php81'] = True
data['wo_php'] = 'php81'
elif config_php_ver == '8.2':
data['php82'] = True
data['wo_php'] = 'php82'
else:
data['php73'] = True
data['wo_php'] = 'php73'
config_php_ver = self.app.config.get('php', 'version')
for wo_key, php_ver in WOVar.wo_php_versions.items():
if php_ver == config_php_ver:
data[wo_key] = True
data['wo_php'] = wo_key
php_version = php_ver
break
if ((not pargs.wpfc) and (not pargs.wpsc) and
(not pargs.wprocket) and
@@ -331,19 +301,6 @@ class WOSiteCreateController(CementBaseController):
" http://{0}".format(wo_domain))
return
if data['php72']:
php_version = "7.2"
elif data['php74']:
php_version = "7.4"
elif data['php80']:
php_version = "8.0"
elif data['php81']:
php_version = "8.1"
elif data['php82']:
php_version = "8.2"
else:
php_version = "7.3"
addNewSite(self, wo_domain, stype, cache, wo_site_webroot,
php_version=php_version)

2
wo/cli/plugins/sitedb.py
View File

@@ -11,7 +11,7 @@ from wo.core.logging import Log
def addNewSite(self, site, stype, cache, path,
enabled=True, ssl=False, fs='ext4', db='mysql',
db_name=None, db_user=None, db_password=None,
db_host='localhost', hhvm=0, php_version='7.2'):
db_host='localhost', hhvm=0, php_version='8.1'):
"""
Add New Site record information into the wo database.
"""