From a6b1d9e5d8f18313ba46a4509d87d53cd29382d8 Mon Sep 17 00:00:00 2001 From: Spitap Date: Wed, 26 Apr 2023 08:21:33 +0200 Subject: [PATCH] Updated for 2.1 --- modoboa_installer/compatibility_matrix.py | 7 ++++++- modoboa_installer/config_dict_template.py | 2 +- modoboa_installer/scripts/modoboa.py | 2 ++ 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/modoboa_installer/compatibility_matrix.py b/modoboa_installer/compatibility_matrix.py index 285ae90..f610124 100644 --- a/modoboa_installer/compatibility_matrix.py +++ b/modoboa_installer/compatibility_matrix.py @@ -20,7 +20,12 @@ COMPATIBILITY_MATRIX = { "modoboa-pdfcredentials": ">=1.1.1", "modoboa-sievefilters": ">=1.1.1", "modoboa-webmail": ">=1.2.0", - } + }, + "2.1.0": { + "modoboa-pdfcredentials": None, + "modoboa-dmarc": None, + "modoboa-imap-migration": None, + }, } EXTENSIONS_AVAILABILITY = { diff --git a/modoboa_installer/config_dict_template.py b/modoboa_installer/config_dict_template.py index 73256d6..73cc2c5 100644 --- a/modoboa_installer/config_dict_template.py +++ b/modoboa_installer/config_dict_template.py @@ -183,7 +183,7 @@ ConfigDictTemplate = [ { "option": "extensions", "default": ( - "modoboa-amavis modoboa-pdfcredentials " + "modoboa-amavis " "modoboa-postfix-autoreply modoboa-sievefilters " "modoboa-webmail modoboa-contacts " "modoboa-radicale" diff --git a/modoboa_installer/scripts/modoboa.py b/modoboa_installer/scripts/modoboa.py index 18fd7de..6b33e6f 100644 --- a/modoboa_installer/scripts/modoboa.py +++ b/modoboa_installer/scripts/modoboa.py @@ -87,6 +87,8 @@ class Modoboa(base.Installer): continue if extension in matrix: req_version = matrix[extension] + if req_version is None: + continue req_version = req_version.replace("<", "\<") req_version = req_version.replace(">", "\>") packages.append("{}{}".format(extension, req_version))