evgeny/modoboa-installer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #492 from modoboa/fix-mysql-db-ubuntu

Browse Source 
Added workaround for ubuntu 20 and 22
This commit is contained in:
Antoine Nguyen
2023-04-25 17:30:17 +02:00
committed by GitHub
parent 3767c056ca 0040277380
commit 7752b860fa
1 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
modoboa_installer/database.py
View File

@@ -183,7 +183,11 @@ class MySQL(Database):
else: else:
self.packages["deb"].append("libmariadbclient-dev") self.packages["deb"].append("libmariadbclient-dev")
elif name == "ubuntu": elif name == "ubuntu":
self.packages["deb"].append("libmysqlclient-dev") if version.startswith("2"):
# Works for Ubuntu 22 and 20
self.packages["deb"].append("libmariadb-dev")
else:
self.packages["deb"].append("libmysqlclient-dev")
super(MySQL, self).install_package() super(MySQL, self).install_package()
queries = [] queries = []
if name.startswith("debian"): if name.startswith("debian"):
@@ -195,12 +199,15 @@ class MySQL(Database):
"mariadb-server", "root_password_again", "password", "mariadb-server", "root_password_again", "password",
self.dbpassword) self.dbpassword)
return return
if version.startswith("11"): if (
queries = [ (name.startswith("debian") and version.startswith("11")) or
"SET PASSWORD FOR 'root'@'localhost' = PASSWORD('{}')" (name.startswith("ubuntu") and version.startswith("22"))
.format(self.dbpassword), ):
"flush privileges" queries = [
] "SET PASSWORD FOR 'root'@'localhost' = PASSWORD('{}')"
.format(self.dbpassword),
"flush privileges"
]
if not queries: if not queries:
queries = [ queries = [
"UPDATE user SET plugin='' WHERE user='root'", "UPDATE user SET plugin='' WHERE user='root'",