Refactor site update
This commit is contained in:
VirtuBox
@@ -108,20 +108,9 @@ class WOSiteUpdateController(CementBaseController):
|
|||||||
if pargs.html:
|
if pargs.html:
|
||||||
Log.error(self, "No site can be updated to html")
|
Log.error(self, "No site can be updated to html")
|
||||||
|
|
||||||
if not (pargs.php or pargs.php72 or pargs.php73 or pargs.php74 or
|
if all(value is None or value is False for value in vars(pargs).values()):
|
||||||
pargs.php80 or pargs.php81 or pargs.php82 or
|
|
||||||
pargs.mysql or pargs.wp or pargs.wpsubdir or
|
|
||||||
pargs.wpsubdomain or pargs.wpfc or pargs.wpsc or
|
|
||||||
pargs.wprocket or pargs.wpce or
|
|
||||||
pargs.wpredis or pargs.letsencrypt or pargs.hsts or
|
|
||||||
pargs.dns or pargs.force):
|
|
||||||
Log.error(self, "Please provide options to update sites.")
|
Log.error(self, "Please provide options to update sites.")
|
||||||
|
|
||||||
if pargs.all:
|
|
||||||
if pargs.site_name:
|
|
||||||
Log.error(self, "`--all` option cannot be used with site name"
|
|
||||||
" provided")
|
|
||||||
|
|
||||||
sites = getAllsites(self)
|
sites = getAllsites(self)
|
||||||
if not sites:
|
if not sites:
|
||||||
pass
|
pass
|
||||||
@@ -190,13 +179,6 @@ class WOSiteUpdateController(CementBaseController):
|
|||||||
check_ssl = check_site.is_ssl
|
check_ssl = check_site.is_ssl
|
||||||
check_php_version = check_site.php_version
|
check_php_version = check_site.php_version
|
||||||
|
|
||||||
old_php72 = bool(check_php_version == "7.2")
|
|
||||||
old_php73 = bool(check_php_version == "7.3")
|
|
||||||
old_php74 = bool(check_php_version == "7.4")
|
|
||||||
old_php80 = bool(check_php_version == "8.0")
|
|
||||||
old_php81 = bool(check_php_version == "8.1")
|
|
||||||
old_php82 = bool(check_php_version == "8.2")
|
|
||||||
|
|
||||||
if ((pargs.password or pargs.hsts or
|
if ((pargs.password or pargs.hsts or
|
||||||
pargs.ngxblocker or pargs.letsencrypt == 'renew') and not (
|
pargs.ngxblocker or pargs.letsencrypt == 'renew') and not (
|
||||||
pargs.html or pargs.php or pargs.php72 or pargs.php73 or
|
pargs.html or pargs.php or pargs.php72 or pargs.php73 or
|
||||||
@@ -368,131 +350,37 @@ class WOSiteUpdateController(CementBaseController):
|
|||||||
data['multisite'] = True
|
data['multisite'] = True
|
||||||
data['wpsubdir'] = False
|
data['wpsubdir'] = False
|
||||||
|
|
||||||
if oldcachetype == 'basic':
|
# Set all variables to false
|
||||||
data['basic'] = True
|
data['basic'] = False
|
||||||
data['wpfc'] = False
|
data['wpfc'] = False
|
||||||
data['wpsc'] = False
|
data['wpsc'] = False
|
||||||
data['wpredis'] = False
|
data['wpredis'] = False
|
||||||
data['wprocket'] = False
|
data['wprocket'] = False
|
||||||
data['wpce'] = False
|
data['wpce'] = False
|
||||||
elif oldcachetype == 'wpfc':
|
|
||||||
data['basic'] = False
|
|
||||||
data['wpfc'] = True
|
|
||||||
data['wpsc'] = False
|
|
||||||
data['wpredis'] = False
|
|
||||||
data['wprocket'] = False
|
|
||||||
data['wpce'] = False
|
|
||||||
elif oldcachetype == 'wpsc':
|
|
||||||
data['basic'] = False
|
|
||||||
data['wpfc'] = False
|
|
||||||
data['wpsc'] = True
|
|
||||||
data['wpredis'] = False
|
|
||||||
data['wprocket'] = False
|
|
||||||
data['wpce'] = False
|
|
||||||
elif oldcachetype == 'wpredis':
|
|
||||||
data['basic'] = False
|
|
||||||
data['wpfc'] = False
|
|
||||||
data['wpsc'] = False
|
|
||||||
data['wpredis'] = True
|
|
||||||
data['wprocket'] = False
|
|
||||||
data['wpce'] = False
|
|
||||||
elif oldcachetype == 'wprocket':
|
|
||||||
data['basic'] = False
|
|
||||||
data['wpfc'] = False
|
|
||||||
data['wpsc'] = False
|
|
||||||
data['wpredis'] = False
|
|
||||||
data['wprocket'] = True
|
|
||||||
data['wpce'] = False
|
|
||||||
elif oldcachetype == 'wpce':
|
|
||||||
data['basic'] = False
|
|
||||||
data['wpfc'] = False
|
|
||||||
data['wpsc'] = False
|
|
||||||
data['wpredis'] = False
|
|
||||||
data['wprocket'] = False
|
|
||||||
data['wpce'] = True
|
|
||||||
|
|
||||||
if pargs.php72:
|
# set the data if oldcachetype is True
|
||||||
Log.debug(self, "pargs.php72 detected")
|
if oldcachetype in data:
|
||||||
data['php72'] = True
|
data[oldcachetype] = True
|
||||||
php72 = True
|
|
||||||
elif pargs.php73:
|
|
||||||
Log.debug(self, "pargs.php73 detected")
|
|
||||||
data['php73'] = True
|
|
||||||
php73 = True
|
|
||||||
elif pargs.php74:
|
|
||||||
Log.debug(self, "pargs.php74 detected")
|
|
||||||
data['php74'] = True
|
|
||||||
php74 = True
|
|
||||||
elif pargs.php80:
|
|
||||||
Log.debug(self, "pargs.php80 detected")
|
|
||||||
data['php80'] = True
|
|
||||||
php80 = True
|
|
||||||
elif pargs.php81:
|
|
||||||
Log.debug(self, "pargs.php81 detected")
|
|
||||||
data['php81'] = True
|
|
||||||
php81 = True
|
|
||||||
elif pargs.php82:
|
|
||||||
Log.debug(self, "pargs.php82 detected")
|
|
||||||
data['php82'] = True
|
|
||||||
php82 = True
|
|
||||||
|
|
||||||
if pargs.php72:
|
for pargs_version in WOVar.wo_php_versions:
|
||||||
if php72 is old_php72:
|
if getattr(pargs, pargs_version):
|
||||||
Log.info(self, "PHP 7.2 is already enabled for given "
|
Log.debug(self, f"pargs.{pargs_version} detected")
|
||||||
"site")
|
data[pargs_version] = True
|
||||||
pargs.php72 = False
|
globals()[pargs_version] = True
|
||||||
|
break
|
||||||
|
|
||||||
if pargs.php73:
|
for pargs_version, version in WOVar.wo_php_versions.items():
|
||||||
if php73 is old_php73:
|
old_version_var = bool(check_php_version == version)
|
||||||
Log.info(self, "PHP 7.3 is already enabled for given "
|
|
||||||
"site")
|
|
||||||
pargs.php73 = False
|
|
||||||
|
|
||||||
if pargs.php74:
|
if getattr(pargs, pargs_version):
|
||||||
if php74 is old_php74:
|
if globals()[pargs_version] is old_version_var:
|
||||||
Log.info(self, "PHP 7.4 is already enabled for given "
|
Log.info(self, f"PHP {version} is already enabled for given site")
|
||||||
"site")
|
setattr(pargs, pargs_version, False)
|
||||||
pargs.php74 = False
|
|
||||||
|
|
||||||
if pargs.php80:
|
if (data and not getattr(pargs, pargs_version)):
|
||||||
if php80 is old_php80:
|
data[pargs_version] = bool(old_version_var is True)
|
||||||
Log.info(self, "PHP 8.0 is already enabled for given "
|
Log.debug(self, f"data {pargs_version} = {data[pargs_version]}")
|
||||||
"site")
|
globals()[pargs_version] = bool(old_version_var is True)
|
||||||
pargs.php80 = False
|
|
||||||
|
|
||||||
if pargs.php81:
|
|
||||||
if php81 is old_php81:
|
|
||||||
Log.info(self, "PHP 8.1 is already enabled for given "
|
|
||||||
"site")
|
|
||||||
pargs.php81 = False
|
|
||||||
|
|
||||||
if pargs.php82:
|
|
||||||
if php82 is old_php82:
|
|
||||||
Log.info(self, "PHP 8.2 is already enabled for given "
|
|
||||||
"site")
|
|
||||||
pargs.php82 = False
|
|
||||||
|
|
||||||
if (data and (not pargs.php73) and
|
|
||||||
(not pargs.php74) and (not pargs.php72) and
|
|
||||||
(not pargs.php80) and (not pargs.php81) and (not pargs.php82)):
|
|
||||||
data['php72'] = bool(old_php72 is True)
|
|
||||||
Log.debug(self, "data php72 = {0}".format(data['php72']))
|
|
||||||
php72 = bool(old_php72 is True)
|
|
||||||
data['php73'] = bool(old_php73 is True)
|
|
||||||
Log.debug(self, "data php73 = {0}".format(data['php73']))
|
|
||||||
php73 = bool(old_php73 is True)
|
|
||||||
data['php74'] = bool(old_php74 is True)
|
|
||||||
Log.debug(self, "data php74 = {0}".format(data['php74']))
|
|
||||||
php74 = bool(old_php74 is True)
|
|
||||||
data['php80'] = bool(old_php80 is True)
|
|
||||||
Log.debug(self, "data php80 = {0}".format(data['php80']))
|
|
||||||
php80 = bool(old_php80 is True)
|
|
||||||
data['php81'] = bool(old_php81 is True)
|
|
||||||
Log.debug(self, "data php81 = {0}".format(data['php81']))
|
|
||||||
php81 = bool(old_php81 is True)
|
|
||||||
data['php82'] = bool(old_php82 is True)
|
|
||||||
Log.debug(self, "data php82 = {0}".format(data['php82']))
|
|
||||||
php82 = bool(old_php82 is True)
|
|
||||||
|
|
||||||
if pargs.letsencrypt:
|
if pargs.letsencrypt:
|
||||||
acme_domains = []
|
acme_domains = []
|
||||||
@@ -569,35 +457,18 @@ class WOSiteUpdateController(CementBaseController):
|
|||||||
data['basic'] = False
|
data['basic'] = False
|
||||||
cache = 'wpce'
|
cache = 'wpce'
|
||||||
|
|
||||||
if ((php73 is old_php73) and (php72 is old_php72) and
|
# Vérification si rien n'a changé
|
||||||
(php74 is old_php74) and (php80 is old_php80) and
|
if all(globals()[version_key] is bool(check_php_version == version) for version_key,
|
||||||
(php81 is old_php81) and (php82 is old_php82) and
|
version in WOVar.wo_php_versions.items()) and (stype == oldsitetype and cache == oldcachetype):
|
||||||
(stype == oldsitetype and
|
|
||||||
cache == oldcachetype)):
|
|
||||||
Log.debug(self, "Nothing to update")
|
Log.debug(self, "Nothing to update")
|
||||||
return 1
|
return 1
|
||||||
|
|
||||||
if php73 is True:
|
# Mise à jour de la version PHP
|
||||||
data['wo_php'] = 'php73'
|
for pargs_version, version in WOVar.wo_php_versions.items():
|
||||||
check_php_version = '7.3'
|
if globals()[pargs_version] is True:
|
||||||
elif php74 is True:
|
data['wo_php'] = pargs_version
|
||||||
data['wo_php'] = 'php74'
|
check_php_version = version
|
||||||
check_php_version = '7.4'
|
break
|
||||||
elif php72 is True:
|
|
||||||
data['wo_php'] = 'php72'
|
|
||||||
check_php_version = '7.2'
|
|
||||||
elif php80 is True:
|
|
||||||
data['wo_php'] = 'php80'
|
|
||||||
check_php_version = '8.0'
|
|
||||||
elif php81 is True:
|
|
||||||
data['wo_php'] = 'php81'
|
|
||||||
check_php_version = '8.1'
|
|
||||||
elif php82 is True:
|
|
||||||
data['wo_php'] = 'php82'
|
|
||||||
check_php_version = '8.2'
|
|
||||||
else:
|
|
||||||
data['wo_php'] = 'php80'
|
|
||||||
check_php_version = '8.0'
|
|
||||||
|
|
||||||
if pargs.hsts:
|
if pargs.hsts:
|
||||||
data['hsts'] = bool(pargs.hsts == "on")
|
data['hsts'] = bool(pargs.hsts == "on")
|
||||||
|
|||||||
Reference in New Issue
Block a user