From 969b43294759eabbac0214c27825dd124164e46c Mon Sep 17 00:00:00 2001 From: VirtuBox Date: Wed, 16 Oct 2019 13:09:06 +0200 Subject: [PATCH] Fix ngxblocker stack --- CHANGELOG.md | 2 +- wo/cli/plugins/stack.py | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 42adbe5..c2af07c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,7 +8,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), ### v3.9.x - [Unreleased] -### v3.9.9.3 - [Unreleased] +### v3.9.9.3 - 2019-10-15 #### Added diff --git a/wo/cli/plugins/stack.py b/wo/cli/plugins/stack.py index e66c8b4..6b2b494 100644 --- a/wo/cli/plugins/stack.py +++ b/wo/cli/plugins/stack.py @@ -5,8 +5,6 @@ import os from cement.core import handler, hook from cement.core.controller import CementBaseController, expose -from wo.cli.plugins.site_functions import * -from wo.cli.plugins.sitedb import * from wo.cli.plugins.stack_migrate import WOStackMigrateController from wo.cli.plugins.stack_pref import post_pref, pre_pref from wo.cli.plugins.stack_services import WOStackStatusController @@ -536,7 +534,7 @@ class WOStackController(CementBaseController): (not pargs.adminer) and (not pargs.utils) and (not pargs.redis) and (not pargs.proftpd) and (not pargs.extplorer) and (not pargs.clamav) and - (not pargs.ufw) and + (not pargs.ufw) and (not pargs.ngxblocker) and (not pargs.phpredisadmin) and (not pargs.sendmail) and (not pargs.php73)): pargs.web = True @@ -570,6 +568,7 @@ class WOStackController(CementBaseController): pargs.fail2ban = True pargs.clamav = True pargs.ufw = True + pargs.ngxblocker = True # NGINX if pargs.nginx: @@ -779,7 +778,7 @@ class WOStackController(CementBaseController): (not pargs.adminer) and (not pargs.utils) and (not pargs.redis) and (not pargs.proftpd) and (not pargs.extplorer) and (not pargs.clamav) and - (not pargs.ufw) and + (not pargs.ufw) and (not pargs.ngxblocker) and (not pargs.phpredisadmin) and (not pargs.sendmail) and (not pargs.php73)): pargs.web = True @@ -813,6 +812,7 @@ class WOStackController(CementBaseController): pargs.fail2ban = True pargs.clamav = True pargs.ufw = True + pargs.ngxblocker = True # NGINX if pargs.nginx: