diff --git a/wo/cli/plugins/stack.py b/wo/cli/plugins/stack.py index 6854bde..a792a38 100644 --- a/wo/cli/plugins/stack.py +++ b/wo/cli/plugins/stack.py @@ -137,7 +137,7 @@ class WOStackController(CementBaseController): pargs.fail2ban = True if pargs.php: - pargs.php72 = True + pargs.php80 = True if pargs.mariadb: pargs.mysql = True @@ -165,9 +165,9 @@ class WOStackController(CementBaseController): elif config_php_ver == '8.0': pargs.php80 = True elif config_php_ver == '8.1': - pargs.php80 = True + pargs.php81 = True else: - pargs.php74 = True + pargs.php80 = True pargs.nginx = True pargs.mysql = True pargs.wpcli = True @@ -519,7 +519,7 @@ class WOStackController(CementBaseController): WOAptGet.is_installed(self, 'php7.4-fpm') or WOAptGet.is_installed(self, 'php8.0-fpm') or WOAptGet.is_installed(self, 'php8.1-fpm')): - pargs.php74 = True + pargs.php80 = True Log.debug(self, "Setting packages variable for utils") packages = packages + [[ "https://raw.githubusercontent.com" @@ -615,7 +615,7 @@ class WOStackController(CementBaseController): (not pargs.ufw) and (not pargs.ngxblocker) and (not pargs.phpredisadmin) and (not pargs.sendmail) and (not pargs.php73) and (not pargs.php74) and - (not pargs.php72) (not pargs.php80) and + (not pargs.php72) and (not pargs.php80) and (not pargs.php81) and (not pargs.all)): self.app.args.print_help() @@ -1040,7 +1040,7 @@ class WOStackController(CementBaseController): WOAptGet.is_installed(self, 'php7.4-fpm') or WOAptGet.is_installed(self, 'php8.0-fpm') or WOAptGet.is_installed(self, 'php8.1-fpm')): - apt_packages = apt_packages + WOVar.wo_php_extra + 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") diff --git a/wo/cli/plugins/stack_upgrade.py b/wo/cli/plugins/stack_upgrade.py index aaf259a..ee0ff5e 100644 --- a/wo/cli/plugins/stack_upgrade.py +++ b/wo/cli/plugins/stack_upgrade.py @@ -39,9 +39,9 @@ class WOStackUpgradeController(CementBaseController): dict(help='Upgrade PHP 7.3 stack', action='store_true')), (['--php74'], dict(help='Upgrade PHP 7.4 stack', action='store_true')), - (['--php80'], + (['--php80'], dict(help='Upgrade PHP 8.0 stack', action='store_true')), - (['--php81'], + (['--php81'], dict(help='Upgrade PHP 8.1 stack', action='store_true')), (['--mysql'], dict(help='Upgrade MySQL stack', action='store_true')), @@ -87,8 +87,8 @@ class WOStackUpgradeController(CementBaseController): if not (pargs.web or pargs.nginx or pargs.php or pargs.php72 or pargs.php73 or pargs.php74 or pargs.php80 or pargs.php81 or pargs.mysql or - pargs.mariadb or pargs.ngxblocker or pargs.all - or pargs.netdata or pargs.wpcli or pargs.composer or + pargs.mariadb or pargs.ngxblocker or pargs.all or + pargs.netdata or pargs.wpcli or pargs.composer or pargs.phpmyadmin or pargs.adminer or pargs.dashboard or pargs.mysqltuner or pargs.redis or pargs.fail2ban or pargs.security):