From fe7df276fc9cebafaf0684428c22ffb956eee108 Mon Sep 17 00:00:00 2001 From: Spitap Date: Thu, 27 Oct 2022 17:25:39 +0200 Subject: [PATCH] Check dovecot version greater --- modoboa_installer/scripts/dovecot.py | 2 +- modoboa_installer/scripts/files/dovecot/conf.d/10-ssl.conf.tpl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modoboa_installer/scripts/dovecot.py b/modoboa_installer/scripts/dovecot.py index f9bb641..dfbca49 100644 --- a/modoboa_installer/scripts/dovecot.py +++ b/modoboa_installer/scripts/dovecot.py @@ -60,7 +60,7 @@ class Dovecot(base.Installer): pw = pwd.getpwnam(self.user) dovecot_package = {"deb": "dovecot-core", "rpm": "dovecot"} ssl_protocol_parameter = "ssl_protocols" - if package.backend.get_installed_version(dovecot_package[package.backend.FORMAT]).startswith("2.3"): + if package.backend.get_installed_version(dovecot_package[package.backend.FORMAT]) > "2.3": ssl_protocol_parameter = "ssl_min_protocol" ssl_protocols = "!SSLv2 !SSLv3" if package.backend.get_installed_version("openssl").startswith("1.1") \ diff --git a/modoboa_installer/scripts/files/dovecot/conf.d/10-ssl.conf.tpl b/modoboa_installer/scripts/files/dovecot/conf.d/10-ssl.conf.tpl index 9b058e6..59ed1d5 100644 --- a/modoboa_installer/scripts/files/dovecot/conf.d/10-ssl.conf.tpl +++ b/modoboa_installer/scripts/files/dovecot/conf.d/10-ssl.conf.tpl @@ -8,7 +8,7 @@ # Workarround https://github.com/modoboa/modoboa/issues/2570 # We try to load the key and pass if it fails # Keys require root permissions, standard commands would be blocked -# by permissions +# because dovecot can't load these cert !include_try = /etc/dovecot/conf.d/10-ssl-keys.try # If key file is password protected, give the password here. Alternatively