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

Cleanup php stack removal

Browse Source
This commit is contained in:
VirtuBox
2023-08-05 15:30:45 +02:00
parent c46e5d3b11
commit f9b3f96e14
1 changed files with 31 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

117
wo/cli/plugins/stack.py
View File

@@ -669,97 +669,42 @@ class WOStackController(CementBaseController):
Log.debug(self, "Removing apt_packages variable of Nginx") Log.debug(self, "Removing apt_packages variable of Nginx")
apt_packages = apt_packages + WOVar.wo_nginx apt_packages = apt_packages + WOVar.wo_nginx
# PHP 7.2 # Create a dictionary that maps PHP versions to corresponding variables.
if pargs.php72: php_versions = {
Log.debug(self, "Setting apt_packages variable for PHP 7.2") 'php72': '7.2',
if (WOAptGet.is_installed(self, 'php7.2-fpm')): 'php73': '7.3',
apt_packages = apt_packages + WOVar.wo_php72 'php74': '7.4',
if not (WOAptGet.is_installed(self, 'php7.3-fpm') or 'php80': '8.0',
WOAptGet.is_installed(self, 'php7.4-fpm') or 'php81': '8.1',
WOAptGet.is_installed(self, 'php8.0-fpm') or 'php82': '8.2',
WOAptGet.is_installed(self, 'php8.1-fpm') or }
WOAptGet.is_installed(self, 'php8.2-fpm')):
apt_packages = apt_packages + WOVar.wo_php_extra
else:
Log.debug(self, "PHP 7.2 is not installed")
Log.info(self, "PHP 7.2 is not installed")
# PHP 7.3 wo_vars = {
if pargs.php73: 'php72': WOVar.wo_php72,
Log.debug(self, "Setting apt_packages variable for PHP 7.3") 'php73': WOVar.wo_php73,
if WOAptGet.is_installed(self, 'php7.3-fpm'): 'php74': WOVar.wo_php74,
apt_packages = apt_packages + WOVar.wo_php73 'php80': WOVar.wo_php80,
if not (WOAptGet.is_installed(self, 'php7.2-fpm') or 'php81': WOVar.wo_php81,
WOAptGet.is_installed(self, 'php7.4-fpm') or 'php82': WOVar.wo_php82,
WOAptGet.is_installed(self, 'php8.0-fpm') or }
WOAptGet.is_installed(self, 'php8.1-fpm') or
WOAptGet.is_installed(self, 'php8.2-fpm')):
apt_packages = apt_packages + WOVar.wo_php_extra
else:
Log.debug(self, "PHP 7.3 is not installed")
Log.info(self, "PHP 7.3 is not installed")
# PHP 7.4 # Loop through all versions.
if pargs.php74: for parg_version, version in php_versions.items():
Log.debug(self, "Setting apt_packages variable for PHP 7.4") # Check if this version is present in pargs.
if WOAptGet.is_installed(self, 'php7.4-fpm'): if getattr(pargs, parg_version):
apt_packages = apt_packages + WOVar.wo_php74 Log.debug(self, f"Setting apt_packages variable for PHP {version}")
if not (WOAptGet.is_installed(self, 'php7.3-fpm') or
WOAptGet.is_installed(self, 'php7.2-fpm') or
WOAptGet.is_installed(self, 'php8.0-fpm') or
WOAptGet.is_installed(self, 'php8.1-fpm') or
WOAptGet.is_installed(self, 'php8.2-fpm')):
apt_packages = apt_packages + WOVar.wo_php_extra
else:
Log.debug(self, "PHP 7.4 is not installed")
Log.info(self, "PHP 7.4 is not installed")
# PHP 8.0 if WOAptGet.is_installed(self, f'php{version}-fpm'):
if pargs.php80: apt_packages += wo_vars[parg_version]
Log.debug(self, "Setting apt_packages variable for PHP 8.0")
if WOAptGet.is_installed(self, 'php8.0-fpm'):
apt_packages = apt_packages + WOVar.wo_php80
if not (WOAptGet.is_installed(self, 'php7.3-fpm') or
WOAptGet.is_installed(self, 'php7.2-fpm') or
WOAptGet.is_installed(self, 'php7.4-fpm') or
WOAptGet.is_installed(self, 'php8.1-fpm') or
WOAptGet.is_installed(self, 'php8.2-fpm')):
apt_packages = apt_packages + WOVar.wo_php_extra
else:
Log.debug(self, "PHP 8.0 is not installed")
Log.info(self, "PHP 8.0 is not installed")
# PHP 8.1 # Check if other versions are installed.
if pargs.php81: if not any(WOAptGet.is_installed(self, f'php{other_version}-fpm') for
Log.debug(self, "Setting apt_packages variable for PHP 8.1") other_version in php_versions.values() if other_version != version):
if WOAptGet.is_installed(self, 'php8.1-fpm'): apt_packages += WOVar.wo_php_extra
apt_packages = apt_packages + WOVar.wo_php81
if not (WOAptGet.is_installed(self, 'php7.3-fpm') or
WOAptGet.is_installed(self, 'php7.2-fpm') or
WOAptGet.is_installed(self, 'php7.4-fpm') or
WOAptGet.is_installed(self, 'php8.0-fpm') or
WOAptGet.is_installed(self, 'php8.1-fpm') or
WOAptGet.is_installed(self, 'php8.2-fpm')):
apt_packages = apt_packages + WOVar.wo_php_extra
else:
Log.debug(self, "PHP 8.1 is not installed")
Log.info(self, "PHP 8.1 is not installed")
# PHP 8.2 else:
if pargs.php82: Log.debug(self, f"PHP {version} is not installed")
Log.debug(self, "Setting apt_packages variable for PHP 8.2") Log.info(self, f"PHP {version} is not installed")
if WOAptGet.is_installed(self, 'php8.2-fpm'):
apt_packages = apt_packages + WOVar.wo_php82
if not (WOAptGet.is_installed(self, 'php7.3-fpm') or
WOAptGet.is_installed(self, 'php7.2-fpm') or
WOAptGet.is_installed(self, 'php7.4-fpm') or
WOAptGet.is_installed(self, 'php8.0-fpm') or
WOAptGet.is_installed(self, 'php8.1-fpm') or
WOAptGet.is_installed(self, 'php8.2-fpm')):
apt_packages = apt_packages + WOVar.wo_php_extra
else:
Log.debug(self, "PHP 8.2 is not installed")
Log.info(self, "PHP 8.2 is not installed")
# REDIS # REDIS
if pargs.redis: if pargs.redis: