From daf3ec2d426c912d3dae57b58013e534c572ca36 Mon Sep 17 00:00:00 2001 From: phizev <1267833+phizev@users.noreply.github.com> Date: Sun, 1 Jun 2025 17:41:39 +0200 Subject: [PATCH] Update MySQL (MariaDB) install to account for Ubuntu 24.04. --- modoboa_installer/database.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modoboa_installer/database.py b/modoboa_installer/database.py index 7f7a29f..ec9ad53 100644 --- a/modoboa_installer/database.py +++ b/modoboa_installer/database.py @@ -184,7 +184,7 @@ class MySQL(Database): self.packages["deb"].append("libmariadbclient-dev") elif name == "ubuntu": if version.startswith("2"): - # Works for Ubuntu 22 and 20 + # Works for Ubuntu 20, 22, and 24. self.packages["deb"].append("libmariadb-dev") else: self.packages["deb"].append("libmysqlclient-dev") @@ -201,7 +201,7 @@ class MySQL(Database): return if ( (name.startswith("debian") and (version.startswith("11") or version.startswith("12"))) or - (name.startswith("ubuntu") and version.startswith("22")) + (name.startswith("ubuntu") and int(version[:2]) >= 22) ): queries = [ "SET PASSWORD FOR 'root'@'localhost' = PASSWORD('{}')"