From 36d70b4ff9addf098437128efb71fd8d6b4313b3 Mon Sep 17 00:00:00 2001 From: VirtuBox Date: Sat, 26 Aug 2023 14:33:59 +0200 Subject: [PATCH] Fix wo stack install --- wo/cli/plugins/stack.py | 14 +++++++------- wo/cli/plugins/stack_pref.py | 3 ++- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/wo/cli/plugins/stack.py b/wo/cli/plugins/stack.py index 77fe1d3..6fd38b1 100644 --- a/wo/cli/plugins/stack.py +++ b/wo/cli/plugins/stack.py @@ -119,13 +119,6 @@ class WOStackController(CementBaseController): pargs.admin = True pargs.fail2ban = True - if pargs.php: - if self.app.config.has_section('php'): - config_php_ver = self.app.config.get( - 'php', 'version') - current_php = config_php_ver.replace(".", "") - setattr(self.app.pargs, 'php{0}'.format(current_php), True) - if pargs.mariadb: pargs.mysql = True @@ -165,6 +158,13 @@ class WOStackController(CementBaseController): pargs.clamav = True pargs.ngxblocker = True + if pargs.php: + if self.app.config.has_section('php'): + config_php_ver = self.app.config.get( + 'php', 'version') + current_php = config_php_ver.replace(".", "") + setattr(self.app.pargs, 'php{0}'.format(current_php), True) + # Nginx if pargs.nginx: Log.debug(self, "Setting apt_packages variable for Nginx") diff --git a/wo/cli/plugins/stack_pref.py b/wo/cli/plugins/stack_pref.py index af5871d..40c48bc 100644 --- a/wo/cli/plugins/stack_pref.py +++ b/wo/cli/plugins/stack_pref.py @@ -791,7 +791,7 @@ def post_pref(self, apt_packages, packages, upgrade=False): if os.path.exists('/etc/fail2ban'): WOGit.add(self, ["/etc/fail2ban"], msg="Adding Fail2ban into Git") - Log.info(self, "Configuring Fail2Ban") + Log.wait(self, "Configuring Fail2Ban") nginxf2b = bool(os.path.exists('/var/log/nginx')) data = dict(release=WOVar.wo_version, nginx=nginxf2b) WOTemplate.deploy( @@ -815,6 +815,7 @@ def post_pref(self, apt_packages, packages, upgrade=False): self, ['/etc/fail2ban'], msg="Rollback f2b config") WOService.restart_service(self, 'fail2ban') else: + Log.valide(self, "Configuring Fail2Ban") WOGit.add(self, ["/etc/fail2ban"], msg="Adding Fail2ban into Git")