diff --git a/modoboa_installer/scripts/modoboa.py b/modoboa_installer/scripts/modoboa.py index 835ebe4..8c0cf8e 100644 --- a/modoboa_installer/scripts/modoboa.py +++ b/modoboa_installer/scripts/modoboa.py @@ -248,7 +248,7 @@ class Modoboa(base.Installer): "dovecot_mailboxes_owner": ( self.config.get("dovecot", "mailboxes_owner")), "opendkim_user": self.config.get("opendkim", "user"), - "dkim_user": "_rspamd" if self.config.getboolean("rspamd", "enabled") else self.config.get("opendkim", "user") + "dkim_user": "_rspamd" if self.config.getboolean("rspamd", "enabled") else self.config.get("opendkim", "user"), "minutes": random.randint(1, 59), "hours": f"{random_hour},{random_hour+12}", "modoboa_2_2_or_greater": "" if self.modoboa_2_2_or_greater else "#", diff --git a/run.py b/run.py index fa8c60c..6f7e689 100755 --- a/run.py +++ b/run.py @@ -260,7 +260,6 @@ def main(input_args): # Show concerned components components = [] - incompatible_app_detected = False for section in config.sections(): if section in ["general", "database", "mysql", "postgres", "certificate", "letsencrypt", "backup"]: @@ -268,10 +267,10 @@ def main(input_args): if (config.has_option(section, "enabled") and not config.getboolean(section, "enabled")): continue - incompatible_app_detected = utils.check_app_compatibility(section, config) + incompatible_app_detected = not utils.check_app_compatibility(section, config) + if incompatible_app_detected: + sys.exit(0) components.append(section) - if incompatible_app_detected: - sys.exit(0) utils.printcolor(" ".join(components), utils.YELLOW) if not args.force: answer = utils.user_input("Do you confirm? (Y/n) ")