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
2025-01-28 13:43:59 +01:00
parent 97b98c9d09
commit 95e2010957
2 changed files with 27 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
modoboa_installer/scripts/dovecot.py
View File

@@ -28,9 +28,13 @@ class Dovecot(base.Installer):
"dovecot", "dovecot-pigeonhole"] "dovecot", "dovecot-pigeonhole"]
} }
config_files = [ config_files = [
"dovecot.conf", "dovecot-dict-sql.conf.ext", "conf.d/10-ssl.conf", "dovecot.conf",
"conf.d/10-master.conf", "conf.d/20-lmtp.conf", "conf.d/10-ssl-keys.try", "dovecot-dict-sql.conf.ext",
"conf.d/dovecot-oauth2.conf.ext" "conf.d/10-ssl.conf",
"conf.d/10-master.conf",
"conf.d/20-lmtp.conf",
"conf.d/10-ssl-keys.try",
"conf.d/dovecot-oauth2.conf.ext",
] ]
with_user = True with_user = True
@@ -45,7 +49,10 @@ class Dovecot(base.Installer):
_config_files = self.config_files _config_files = self.config_files
if self.app_config["move_spam_to_junk"]: if self.app_config["move_spam_to_junk"]:
_config_files += ["conf.d/custom_after_sieve/spam-to-junk.sieve"] _config_files += [
"conf.d/custom_after_sieve/spam-to-junk.sieve",
"conf.d/90-sieve.conf",
]
return _config_files + [ return _config_files + [
"dovecot-sql-{}.conf.ext=dovecot-sql.conf.ext" "dovecot-sql-{}.conf.ext=dovecot-sql.conf.ext"

14
modoboa_installer/scripts/rspamd.py
View File

@@ -21,15 +21,21 @@ class Rspamd(base.Installer):
"rspamd", "redis" "rspamd", "redis"
] ]
} }
config_files = ["local.d/dkim_signing.conf", config_files = [
"local.d/arc.conf", "local.d/arc.conf",
"local.d/dkim_signing.conf",
"local.d/dmarc.conf",
"local.d/force_actions.conf",
"local.d/greylist.conf",
"local.d/metrics.conf",
"local.d/milter_headers.conf",
"local.d/mx_check.conf", "local.d/mx_check.conf",
"local.d/redis.conf",
"local.d/settings.conf",
"local.d/spf.conf", "local.d/spf.conf",
"local.d/worker-normal.inc", "local.d/worker-normal.inc",
"local.d/worker-proxy.inc", "local.d/worker-proxy.inc",
"local.d/greylist.conf", ]
"local.d/milter_headers.conf",
"local.d/metrics.conf"]
def __init__(self, *args, **kwargs): def __init__(self, *args, **kwargs):
super().__init__(self, *args, **kwargs) super().__init__(self, *args, **kwargs)