From 419c6caa0353048ecafd7743830dec5a776490b7 Mon Sep 17 00:00:00 2001 From: VirtuBox Date: Mon, 25 Mar 2019 11:47:56 +0100 Subject: [PATCH] remove previous outdated config --- wo/cli/plugins/stack_services.py | 12 ++++-------- wo/cli/plugins/stack_upgrade.py | 10 ++-------- 2 files changed, 6 insertions(+), 16 deletions(-) diff --git a/wo/cli/plugins/stack_services.py b/wo/cli/plugins/stack_services.py index b161974..358eb85 100644 --- a/wo/cli/plugins/stack_services.py +++ b/wo/cli/plugins/stack_services.py @@ -31,8 +31,7 @@ class WOStackStatusController(CementBaseController): self.app.pargs.mysql = True if self.app.pargs.nginx: - if (WOAptGet.is_installed(self, 'nginx-custom') or - WOAptGet.is_installed(self, 'nginx-mainline')): + if (WOAptGet.is_installed(self, 'nginx-custom')): services = services + ['nginx'] else: Log.info(self, "Nginx is not installed") @@ -96,8 +95,7 @@ class WOStackStatusController(CementBaseController): self.app.pargs.mysql = True if self.app.pargs.nginx: - if (WOAptGet.is_installed(self, 'nginx-custom') or - WOAptGet.is_installed(self, 'nginx-mainline')): + if (WOAptGet.is_installed(self, 'nginx-custom')): services = services + ['nginx'] else: Log.info(self, "Nginx is not installed") @@ -162,8 +160,7 @@ class WOStackStatusController(CementBaseController): self.app.pargs.mysql = True if self.app.pargs.nginx: - if (WOAptGet.is_installed(self, 'nginx-custom') or - WOAptGet.is_installed(self, 'nginx-mainline')): + if (WOAptGet.is_installed(self, 'nginx-custom')): services = services + ['nginx'] else: Log.info(self, "Nginx is not installed") @@ -228,8 +225,7 @@ class WOStackStatusController(CementBaseController): self.app.pargs.mysql = True if self.app.pargs.nginx: - if (WOAptGet.is_installed(self, 'nginx-custom') or - WOAptGet.is_installed(self, 'nginx-mainline')): + if (WOAptGet.is_installed(self, 'nginx-custom')): services = services + ['nginx'] else: Log.info(self, "Nginx is not installed") diff --git a/wo/cli/plugins/stack_upgrade.py b/wo/cli/plugins/stack_upgrade.py index b9aa927..6ac25aa 100644 --- a/wo/cli/plugins/stack_upgrade.py +++ b/wo/cli/plugins/stack_upgrade.py @@ -71,14 +71,8 @@ class WOStackUpgradeController(CementBaseController): Log.info(self, "Updating apt-cache, please wait...") WOAptGet.update(self) Log.info(self, "Installing packages, please wait ...") - if (WOVariables.wo_platform_distro == 'ubuntu'): - WOAptGet.install(self, WOVariables.wo_php + + WOAptGet.install(self, WOVariables.wo_php + WOVariables.wo_php_extra) - else: - WOAptGet.install(self, WOVariables.wo_php) - - if WOVariables.wo_platform_distro == "debian": - WOShellExec.cmd_exec(self, "pecl install xdebug") @expose(hide=True) def default(self): @@ -89,7 +83,7 @@ class WOStackUpgradeController(CementBaseController): if ((not self.app.pargs.web) and (not self.app.pargs.nginx) and (not self.app.pargs.php) and (not self.app.pargs.mysql) and (not self.app.pargs.all) and (not self.app.pargs.wpcli) and - (not self.app.pargs.redis) and (not self.app.pargs.nginxmainline)): + (not self.app.pargs.redis)): self.app.pargs.web = True if self.app.pargs.all: