From 004027738008ca83af08ddd634664e1a056d74ee Mon Sep 17 00:00:00 2001 From: Antoine Nguyen Date: Tue, 25 Apr 2023 17:28:04 +0200 Subject: [PATCH] Improved code --- modoboa_installer/database.py | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/modoboa_installer/database.py b/modoboa_installer/database.py index 9b74d1c..f24e37c 100644 --- a/modoboa_installer/database.py +++ b/modoboa_installer/database.py @@ -199,13 +199,10 @@ class MySQL(Database): "mariadb-server", "root_password_again", "password", self.dbpassword) return - if version.startswith("11"): - queries = [ - "SET PASSWORD FOR 'root'@'localhost' = PASSWORD('{}')" - .format(self.dbpassword), - "flush privileges" - ] - if name.startswith("ubuntu") and version.startswith("22"): + if ( + (name.startswith("debian") and version.startswith("11")) or + (name.startswith("ubuntu") and version.startswith("22")) + ): queries = [ "SET PASSWORD FOR 'root'@'localhost' = PASSWORD('{}')" .format(self.dbpassword),