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

Fixed dovecot warning.

Browse Source
This commit is contained in:
Antoine Nguyen
2018-04-02 16:23:47 +02:00
parent c4db97ea7a
commit 704d73cb4d
3 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
modoboa_installer/scripts/dovecot.py
View File

@@ -1,6 +1,7 @@
"""Dovecot related tools.""" """Dovecot related tools."""
import glob import glob
import os
import pwd import pwd
from .. import database from .. import database
@@ -78,7 +79,9 @@ class Dovecot(base.Installer):
"modoboa_dbpassword": self.config.get("modoboa", "dbpassword"), "modoboa_dbpassword": self.config.get("modoboa", "dbpassword"),
"protocols": protocols, "protocols": protocols,
"ssl_protocols": ssl_protocols, "ssl_protocols": ssl_protocols,
"radicale_user": self.config.get("radicale", "user") "radicale_user": self.config.get("radicale", "user"),
"radicale_auth_socket_path": os.path.basename(
self.config.get("dovecot", "radicale_auth_socket_path"))
}) })
return context return context

2
modoboa_installer/scripts/files/radicale/config.tpl
View File

@@ -85,7 +85,7 @@ type = radicale_dovecot_auth
# Incorrect authentication delay (seconds) # Incorrect authentication delay (seconds)
#delay = 1 #delay = 1
auth_socket = %{radicale_auth_socket_path} auth_socket = %{auth_socket_path}
[rights] [rights]

2
modoboa_installer/scripts/radicale.py
View File

@@ -44,7 +44,7 @@ class Radicale(base.Installer):
radicale_auth_socket_path = self.config.get( radicale_auth_socket_path = self.config.get(
"dovecot", "radicale_auth_socket_path") "dovecot", "radicale_auth_socket_path")
context.update({ context.update({
"radicale_auth_socket_path": radicale_auth_socket_path "auth_socket_path": radicale_auth_socket_path
}) })
return context return context