evgeny/modoboa-installer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Few fixes

Browse Source
This commit is contained in:
Antoine Nguyen
2023-09-12 16:58:23 +02:00
parent 077e84349a
commit 35e9ea4bde
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modoboa_installer/scripts/modoboa.py
View File

@@ -248,7 +248,7 @@ class Modoboa(base.Installer):
"dovecot_mailboxes_owner": ( "dovecot_mailboxes_owner": (
self.config.get("dovecot", "mailboxes_owner")), self.config.get("dovecot", "mailboxes_owner")),
"opendkim_user": self.config.get("opendkim", "user"), "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), "minutes": random.randint(1, 59),
"hours": f"{random_hour},{random_hour+12}", "hours": f"{random_hour},{random_hour+12}",
"modoboa_2_2_or_greater": "" if self.modoboa_2_2_or_greater else "#", "modoboa_2_2_or_greater": "" if self.modoboa_2_2_or_greater else "#",

5
run.py
View File

@@ -260,7 +260,6 @@ def main(input_args):
# Show concerned components # Show concerned components
components = [] components = []
incompatible_app_detected = False
for section in config.sections(): for section in config.sections():
if section in ["general", "database", "mysql", "postgres", if section in ["general", "database", "mysql", "postgres",
"certificate", "letsencrypt", "backup"]: "certificate", "letsencrypt", "backup"]:
@@ -268,10 +267,10 @@ def main(input_args):
if (config.has_option(section, "enabled") and if (config.has_option(section, "enabled") and
not config.getboolean(section, "enabled")): not config.getboolean(section, "enabled")):
continue continue
incompatible_app_detected = utils.check_app_compatibility(section, config) incompatible_app_detected = not utils.check_app_compatibility(section, config)
components.append(section)
if incompatible_app_detected: if incompatible_app_detected:
sys.exit(0) sys.exit(0)
components.append(section)
utils.printcolor(" ".join(components), utils.YELLOW) utils.printcolor(" ".join(components), utils.YELLOW)
if not args.force: if not args.force:
answer = utils.user_input("Do you confirm? (Y/n) ") answer = utils.user_input("Do you confirm? (Y/n) ")