diff --git a/wo/cli/plugins/stack_services.py b/wo/cli/plugins/stack_services.py index cc75408..3ab1a7c 100644 --- a/wo/cli/plugins/stack_services.py +++ b/wo/cli/plugins/stack_services.py @@ -20,19 +20,7 @@ class WOStackStatusController(CementBaseController): services = [] wo_system = "/lib/systemd/system/" pargs = self.app.pargs - if not (pargs.nginx or pargs.php or - pargs.php72 or - pargs.php73 or - pargs.php74 or - pargs.php80 or - pargs.php81 or - pargs.php82 or - pargs.mysql or - pargs.redis or - pargs.fail2ban or - pargs.proftpd or - pargs.netdata or - pargs.ufw): + if all(value is None or value is False for value in vars(pargs).values()): pargs.nginx = True pargs.php = True pargs.mysql = True @@ -47,66 +35,16 @@ class WOStackStatusController(CementBaseController): Log.info(self, "Nginx is not installed") if pargs.php: - if os.path.exists('{0}'.format(wo_system) + 'php7.2-fpm.service'): - services = services + ['php7.2-fpm'] - else: - Log.info(self, "PHP7.2-FPM is not installed") - if os.path.exists('{0}'.format(wo_system) + 'php7.3-fpm.service'): - services = services + ['php7.3-fpm'] - else: - Log.info(self, "PHP7.3-FPM is not installed") - if os.path.exists('{0}'.format(wo_system) + 'php7.4-fpm.service'): - services = services + ['php7.4-fpm'] - else: - Log.info(self, "PHP7.4-FPM is not installed") - if os.path.exists('{0}'.format(wo_system) + 'php8.0-fpm.service'): - services = services + ['php8.0-fpm'] - else: - Log.info(self, "PHP8.0-FPM is not installed") - if os.path.exists('{0}'.format(wo_system) + 'php8.1-fpm.service'): - services = services + ['php8.1-fpm'] - else: - Log.info(self, "PHP8.1-FPM is not installed") - if os.path.exists('{0}'.format(wo_system) + 'php8.2-fpm.service'): - services = services + ['php8.2-fpm'] - else: - Log.info(self, "PHP8.2-FPM is not installed") + for parg_version, version in WOVar.wo_php_versions.items(): + if os.path.exists(f'{wo_system}' + f'php{version}-fpm.service'): + services = services + [f'php{version}-fpm'] - if pargs.php72: - if os.path.exists('{0}'.format(wo_system) + 'php7.2-fpm.service'): - services = services + ['php7.2-fpm'] + for parg_version, version in WOVar.wo_php_versions.items(): + if (getattr(pargs, parg_version, False) and + os.path.exists(f'{wo_system}' + f'php{version}-fpm.service')): + services = services + [f'php{version}-fpm'] else: - Log.info(self, "PHP7.2-FPM is not installed") - - if pargs.php73: - if os.path.exists('{0}'.format(wo_system) + 'php7.3-fpm.service'): - services = services + ['php7.3-fpm'] - else: - Log.info(self, "PHP7.3-FPM is not installed") - - if pargs.php74: - if os.path.exists('{0}'.format(wo_system) + 'php7.4-fpm.service'): - services = services + ['php7.4-fpm'] - else: - Log.info(self, "PHP7.4-FPM is not installed") - - if pargs.php80: - if os.path.exists('{0}'.format(wo_system) + 'php8.0-fpm.service'): - services = services + ['php8.0-fpm'] - else: - Log.info(self, "PHP8.0-FPM is not installed") - - if pargs.php81: - if os.path.exists('{0}'.format(wo_system) + 'php8.1-fpm.service'): - services = services + ['php8.1-fpm'] - else: - Log.info(self, "PHP8.1-FPM is not installed") - - if pargs.php82: - if os.path.exists('{0}'.format(wo_system) + 'php8.2-fpm.service'): - services = services + ['php8.2-fpm'] - else: - Log.info(self, "PHP8.2-FPM is not installed") + Log.info(self, f"PHP{version}-FPM is not installed") if pargs.mysql: if ((WOVar.wo_mysql_host == "localhost") or @@ -156,14 +94,7 @@ class WOStackStatusController(CementBaseController): services = [] wo_system = "/lib/systemd/system/" pargs = self.app.pargs - if not (pargs.nginx or - pargs.php or pargs.php72 or pargs.php73 or pargs.php74 or - pargs.php80 or pargs.php81 or pargs.php82 or - pargs.mysql or - pargs.fail2ban or - pargs.netdata or - pargs.proftpd or - pargs.redis): + if all(value is None or value is False for value in vars(pargs).values()): pargs.nginx = True pargs.php = True pargs.mysql = True @@ -175,54 +106,16 @@ class WOStackStatusController(CementBaseController): Log.info(self, "Nginx is not installed") if pargs.php: - if os.path.exists('{0}'.format(wo_system) + 'php7.2-fpm.service'): - services = services + ['php7.2-fpm'] - else: - Log.info(self, "PHP7.2-FPM is not installed") - if os.path.exists('{0}'.format(wo_system) + 'php7.3-fpm.service'): - services = services + ['php7.3-fpm'] - else: - Log.info(self, "PHP7.3-FPM is not installed") - if os.path.exists('{0}'.format(wo_system) + 'php7.4-fpm.service'): - services = services + ['php7.4-fpm'] - else: - Log.info(self, "PHP7.4-FPM is not installed") + for parg_version, version in WOVar.wo_php_versions.items(): + if os.path.exists(f'{wo_system}' + f'php{version}-fpm.service'): + services = services + [f'php{version}-fpm'] - if pargs.php72: - if os.path.exists('{0}'.format(wo_system) + 'php7.2-fpm.service'): - services = services + ['php7.2-fpm'] + for parg_version, version in WOVar.wo_php_versions.items(): + if (getattr(pargs, parg_version, False) and + os.path.exists(f'{wo_system}' + f'php{version}-fpm.service')): + services = services + [f'php{version}-fpm'] else: - Log.info(self, "PHP7.2-FPM is not installed") - - if pargs.php73: - if os.path.exists('{0}'.format(wo_system) + 'php7.3-fpm.service'): - services = services + ['php7.3-fpm'] - else: - Log.info(self, "PHP7.3-FPM is not installed") - - if pargs.php74: - if os.path.exists('{0}'.format(wo_system) + 'php7.4-fpm.service'): - services = services + ['php7.4-fpm'] - else: - Log.info(self, "PHP7.4-FPM is not installed") - - if pargs.php80: - if os.path.exists('{0}'.format(wo_system) + 'php8.0-fpm.service'): - services = services + ['php8.0-fpm'] - else: - Log.info(self, "PHP8.0-FPM is not installed") - - if pargs.php81: - if os.path.exists('{0}'.format(wo_system) + 'php8.1-fpm.service'): - services = services + ['php8.1-fpm'] - else: - Log.info(self, "PHP8.1-FPM is not installed") - - if pargs.php82: - if os.path.exists('{0}'.format(wo_system) + 'php8.2-fpm.service'): - services = services + ['php8.2-fpm'] - else: - Log.info(self, "PHP8.2-FPM is not installed") + Log.info(self, f"PHP{version}-FPM is not installed") if pargs.mysql: if ((WOVar.wo_mysql_host == "localhost") or @@ -272,14 +165,7 @@ class WOStackStatusController(CementBaseController): services = [] wo_system = "/lib/systemd/system/" pargs = self.app.pargs - if not (pargs.nginx or - pargs.php or pargs.php72 or pargs.php73 or pargs.php74 or - pargs.php80 or pargs.php81 or pargs.php82 or - pargs.mysql or - pargs.netdata or - pargs.proftpd or - pargs.redis or - pargs.fail2ban): + if all(value is None or value is False for value in vars(pargs).values()): pargs.nginx = True pargs.php = True pargs.mysql = True @@ -292,66 +178,16 @@ class WOStackStatusController(CementBaseController): Log.info(self, "Nginx is not installed") if pargs.php: - if os.path.exists('{0}'.format(wo_system) + 'php7.2-fpm.service'): - services = services + ['php7.2-fpm'] - else: - Log.info(self, "PHP7.2-FPM is not installed") - if os.path.exists('{0}'.format(wo_system) + 'php7.3-fpm.service'): - services = services + ['php7.3-fpm'] - else: - Log.info(self, "PHP7.3-FPM is not installed") - if os.path.exists('{0}'.format(wo_system) + 'php7.4-fpm.service'): - services = services + ['php7.4-fpm'] - else: - Log.info(self, "PHP7.4-FPM is not installed") - if os.path.exists('{0}'.format(wo_system) + 'php8.0-fpm.service'): - services = services + ['php8.0-fpm'] - else: - Log.info(self, "PHP8.0-FPM is not installed") - if os.path.exists('{0}'.format(wo_system) + 'php8.1-fpm.service'): - services = services + ['php8.1-fpm'] - else: - Log.info(self, "PHP8.1-FPM is not installed") - if os.path.exists('{0}'.format(wo_system) + 'php8.2-fpm.service'): - services = services + ['php8.2-fpm'] - else: - Log.info(self, "PHP8.2-FPM is not installed") + for parg_version, version in WOVar.wo_php_versions.items(): + if os.path.exists(f'{wo_system}' + f'php{version}-fpm.service'): + services = services + [f'php{version}-fpm'] - if pargs.php72: - if os.path.exists('{0}'.format(wo_system) + 'php7.2-fpm.service'): - services = services + ['php7.2-fpm'] + for parg_version, version in WOVar.wo_php_versions.items(): + if (getattr(pargs, parg_version, False) and + os.path.exists(f'{wo_system}' + f'php{version}-fpm.service')): + services = services + [f'php{version}-fpm'] else: - Log.info(self, "PHP7.2-FPM is not installed") - - if pargs.php73: - if os.path.exists('{0}'.format(wo_system) + 'php7.3-fpm.service'): - services = services + ['php7.3-fpm'] - else: - Log.info(self, "PHP7.3-FPM is not installed") - - if pargs.php74: - if os.path.exists('{0}'.format(wo_system) + 'php7.4-fpm.service'): - services = services + ['php7.4-fpm'] - else: - Log.info(self, "PHP7.4-FPM is not installed") - - if pargs.php80: - if os.path.exists('{0}'.format(wo_system) + 'php8.0-fpm.service'): - services = services + ['php8.0-fpm'] - else: - Log.info(self, "PHP8.0-FPM is not installed") - - if pargs.php81: - if os.path.exists('{0}'.format(wo_system) + 'php8.1-fpm.service'): - services = services + ['php8.1-fpm'] - else: - Log.info(self, "PHP8.1-FPM is not installed") - - if pargs.php82: - if os.path.exists('{0}'.format(wo_system) + 'php8.2-fpm.service'): - services = services + ['php8.2-fpm'] - else: - Log.info(self, "PHP8.2-FPM is not installed") + Log.info(self, f"PHP{version}-FPM is not installed") if pargs.mysql: if ((WOVar.wo_mysql_host == "localhost") or @@ -401,18 +237,7 @@ class WOStackStatusController(CementBaseController): services = [] wo_system = "/lib/systemd/system/" pargs = self.app.pargs - if not (pargs.nginx or pargs.php or - pargs.php72 or - pargs.php73 or - pargs.php74 or - pargs.php80 or - pargs.php81 or - pargs.php82 or - pargs.mysql or - pargs.netdata or - pargs.proftpd or - pargs.redis or - pargs.fail2ban): + if all(value is None or value is False for value in vars(pargs).values()): pargs.nginx = True pargs.php = True pargs.mysql = True @@ -427,66 +252,16 @@ class WOStackStatusController(CementBaseController): Log.info(self, "Nginx is not installed") if pargs.php: - if os.path.exists('{0}'.format(wo_system) + 'php7.2-fpm.service'): - services = services + ['php7.2-fpm'] - else: - Log.info(self, "PHP7.2-FPM is not installed") - if os.path.exists('{0}'.format(wo_system) + 'php7.3-fpm.service'): - services = services + ['php7.3-fpm'] - else: - Log.info(self, "PHP7.3-FPM is not installed") - if os.path.exists('{0}'.format(wo_system) + 'php7.4-fpm.service'): - services = services + ['php7.4-fpm'] - else: - Log.info(self, "PHP7.4-FPM is not installed") - if os.path.exists('{0}'.format(wo_system) + 'php8.0-fpm.service'): - services = services + ['php8.0-fpm'] - else: - Log.info(self, "PHP8.0-FPM is not installed") - if os.path.exists('{0}'.format(wo_system) + 'php8.1-fpm.service'): - services = services + ['php8.1-fpm'] - else: - Log.info(self, "PHP8.1-FPM is not installed") - if os.path.exists('{0}'.format(wo_system) + 'php8.2-fpm.service'): - services = services + ['php8.2-fpm'] - else: - Log.info(self, "PHP8.2-FPM is not installed") + for parg_version, version in WOVar.wo_php_versions.items(): + if os.path.exists(f'{wo_system}' + f'php{version}-fpm.service'): + services = services + [f'php{version}-fpm'] - if pargs.php72: - if os.path.exists('{0}'.format(wo_system) + 'php7.2-fpm.service'): - services = services + ['php7.2-fpm'] + for parg_version, version in WOVar.wo_php_versions.items(): + if (getattr(pargs, parg_version, False) and + os.path.exists(f'{wo_system}' + f'php{version}-fpm.service')): + services = services + [f'php{version}-fpm'] else: - Log.info(self, "PHP7.2-FPM is not installed") - - if pargs.php73: - if os.path.exists('{0}'.format(wo_system) + 'php7.3-fpm.service'): - services = services + ['php7.3-fpm'] - else: - Log.info(self, "PHP7.3-FPM is not installed") - - if pargs.php74: - if os.path.exists('{0}'.format(wo_system) + 'php7.4-fpm.service'): - services = services + ['php7.4-fpm'] - else: - Log.info(self, "PHP7.4-FPM is not installed") - - if pargs.php80: - if os.path.exists('{0}'.format(wo_system) + 'php8.0-fpm.service'): - services = services + ['php8.0-fpm'] - else: - Log.info(self, "PHP8.0-FPM is not installed") - - if pargs.php81: - if os.path.exists('{0}'.format(wo_system) + 'php8.1-fpm.service'): - services = services + ['php8.1-fpm'] - else: - Log.info(self, "PHP8.1-FPM is not installed") - - if pargs.php82: - if os.path.exists('{0}'.format(wo_system) + 'php8.2-fpm.service'): - services = services + ['php8.2-fpm'] - else: - Log.info(self, "PHP8.2-FPM is not installed") + Log.info(self, f"PHP{version}-FPM is not installed") if pargs.mysql: if ((WOVar.wo_mysql_host == "localhost") or @@ -547,14 +322,7 @@ class WOStackStatusController(CementBaseController): services = [] wo_system = "/lib/systemd/system/" pargs = self.app.pargs - if not (pargs.nginx or pargs.php or - pargs.php72 or pargs.php73 or pargs.php74 or - pargs.php80 or pargs.php81 or pargs.php82 or - pargs.mysql or - pargs.netdata or - pargs.proftpd or - pargs.redis or - pargs.fail2ban): + if all(value is None or value is False for value in vars(pargs).values()): pargs.nginx = True pargs.php = True pargs.mysql = True @@ -567,66 +335,16 @@ class WOStackStatusController(CementBaseController): Log.info(self, "Nginx is not installed") if pargs.php: - if os.path.exists('{0}'.format(wo_system) + 'php7.2-fpm.service'): - services = services + ['php7.2-fpm'] - else: - Log.info(self, "PHP7.2-FPM is not installed") - if os.path.exists('{0}'.format(wo_system) + 'php7.3-fpm.service'): - services = services + ['php7.3-fpm'] - else: - Log.info(self, "PHP7.3-FPM is not installed") - if os.path.exists('{0}'.format(wo_system) + 'php7.4-fpm.service'): - services = services + ['php7.4-fpm'] - else: - Log.info(self, "PHP7.4-FPM is not installed") - if os.path.exists('{0}'.format(wo_system) + 'php8.0-fpm.service'): - services = services + ['php8.0-fpm'] - else: - Log.info(self, "PHP8.0-FPM is not installed") - if os.path.exists('{0}'.format(wo_system) + 'php8.1-fpm.service'): - services = services + ['php8.1-fpm'] - else: - Log.info(self, "PHP8.1-FPM is not installed") - if os.path.exists('{0}'.format(wo_system) + 'php8.2-fpm.service'): - services = services + ['php8.2-fpm'] - else: - Log.info(self, "PHP8.2-FPM is not installed") + for parg_version, version in WOVar.wo_php_versions.items(): + if os.path.exists(f'{wo_system}' + f'php{version}-fpm.service'): + services = services + [f'php{version}-fpm'] - if pargs.php72: - if os.path.exists('{0}'.format(wo_system) + 'php7.2-fpm.service'): - services = services + ['php7.2-fpm'] + for parg_version, version in WOVar.wo_php_versions.items(): + if (getattr(pargs, parg_version, False) and + os.path.exists(f'{wo_system}' + f'php{version}-fpm.service')): + services = services + [f'php{version}-fpm'] else: - Log.info(self, "PHP7.2-FPM is not installed") - - if pargs.php73: - if os.path.exists('{0}'.format(wo_system) + 'php7.3-fpm.service'): - services = services + ['php7.3-fpm'] - else: - Log.info(self, "PHP7.3-FPM is not installed") - - if pargs.php74: - if os.path.exists('{0}'.format(wo_system) + 'php7.4-fpm.service'): - services = services + ['php7.4-fpm'] - else: - Log.info(self, "PHP7.4-FPM is not installed") - - if pargs.php80: - if os.path.exists('{0}'.format(wo_system) + 'php8.0-fpm.service'): - services = services + ['php8.0-fpm'] - else: - Log.info(self, "PHP8.0-FPM is not installed") - - if pargs.php81: - if os.path.exists('{0}'.format(wo_system) + 'php8.1-fpm.service'): - services = services + ['php8.1-fpm'] - else: - Log.info(self, "PHP8.1-FPM is not installed") - - if pargs.php82: - if os.path.exists('{0}'.format(wo_system) + 'php8.2-fpm.service'): - services = services + ['php8.2-fpm'] - else: - Log.info(self, "PHP8.2-FPM is not installed") + Log.info(self, f"PHP{version}-FPM is not installed") if pargs.mysql: if ((WOVar.wo_mysql_host == "localhost") or