Malin/WPIQ
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix mariadb removal

Browse Source
This commit is contained in:
VirtuBox
2019-09-04 18:38:28 +02:00
parent ff506142ce
commit 56895cdc55
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
wo/cli/plugins/stack.py
View File

@@ -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')

2
wo/cli/plugins/stack_migrate.py
View File

@@ -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)