From e251fa693b855e21c025fee73660932289deaf63 Mon Sep 17 00:00:00 2001 From: Spitap Date: Sun, 15 Oct 2023 11:42:58 +0200 Subject: [PATCH] small fix --- modoboa_installer/config_dict_template.py | 2 +- modoboa_installer/utils.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modoboa_installer/config_dict_template.py b/modoboa_installer/config_dict_template.py index c991f7aa..143867a6 100644 --- a/modoboa_installer/config_dict_template.py +++ b/modoboa_installer/config_dict_template.py @@ -253,7 +253,7 @@ def is_email(user_input): }, { "name": "rspamd", - "if": ["antispam.enabled=true", "antispam.type=amavis"], + "if": ["antispam.enabled=true", "antispam.type=rspamd"], "values": [ { "option": "enabled", diff --git a/modoboa_installer/utils.py b/modoboa_installer/utils.py index dc5dd5e0..522bf23b 100644 --- a/modoboa_installer/utils.py +++ b/modoboa_installer/utils.py @@ -317,8 +317,8 @@ def validate(value, config_entry): def get_entry_value(entry: dict, interactive: bool, config: configparser.ConfigParser) -> string: default_entry = entry["default"] if type(default_entry) is type(list()): - default_value = check_if_condition(config, default_entry) - if callable(default_entry): + default_value = str(check_if_condition(config, default_entry)).lower() + elif callable(default_entry): default_value = entry["default"]() else: default_value = default_entry