From 56895cdc5506dd961e3896576a161fd345ac72f0 Mon Sep 17 00:00:00 2001 From: VirtuBox Date: Wed, 4 Sep 2019 18:38:28 +0200 Subject: [PATCH] Fix mariadb removal --- wo/cli/plugins/stack.py | 8 ++++---- wo/cli/plugins/stack_migrate.py | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/wo/cli/plugins/stack.py b/wo/cli/plugins/stack.py index 8daf1c4..4da3b90 100644 --- a/wo/cli/plugins/stack.py +++ b/wo/cli/plugins/stack.py @@ -601,7 +601,7 @@ class WOStackController(CementBaseController): # MariaDB if pargs.mysql: Log.debug(self, "Removing apt_packages variable of MySQL") - apt_packages = apt_packages + WOVariables.wo_mysql + apt_packages = apt_packages + ['mariadb-server'] # mysqlclient if pargs.mysqlclient: @@ -706,7 +706,7 @@ class WOStackController(CementBaseController): if (set(["nginx-custom"]).issubset(set(apt_packages))): WOService.stop_service(self, 'nginx') - if (set(WOVariables.wo_mysql).issubset(set(apt_packages))): + if (set(["mariadb-server"]).issubset(set(apt_packages))): WOMysql.backupAll(self) WOService.stop_service(self, 'mysql') @@ -820,7 +820,7 @@ class WOStackController(CementBaseController): # MariaDB if pargs.mysql: Log.debug(self, "Removing apt_packages variable of MySQL") - apt_packages = apt_packages + WOVariables.wo_mysql + apt_packages = apt_packages + ['mariadb-server'] # mysqlclient if pargs.mysqlclient: @@ -932,7 +932,7 @@ class WOStackController(CementBaseController): if (set(["fail2ban"]).issubset(set(apt_packages))): WOService.stop_service(self, 'fail2ban') - if (set(WOVariables.wo_mysql).issubset(set(apt_packages))): + if (set(["mariadb-server"]).issubset(set(apt_packages))): WOMysql.backupAll(self) WOService.stop_service(self, 'mysql') diff --git a/wo/cli/plugins/stack_migrate.py b/wo/cli/plugins/stack_migrate.py index 63a940b..5c47906 100644 --- a/wo/cli/plugins/stack_migrate.py +++ b/wo/cli/plugins/stack_migrate.py @@ -78,7 +78,7 @@ class WOStackMigrateController(CementBaseController): log=False) # Install MariaDB - apt_packages = WOVariables.wo_mysql + apt_packages = ["mariadb-server"] Log.info(self, "Updating apt-cache, hang on...") WOAptGet.update(self)