diff --git a/modoboa_installer/scripts/dovecot.py b/modoboa_installer/scripts/dovecot.py index 093fbcf..3830216 100644 --- a/modoboa_installer/scripts/dovecot.py +++ b/modoboa_installer/scripts/dovecot.py @@ -1,6 +1,7 @@ """Dovecot related tools.""" import glob +import os import pwd from .. import database @@ -78,7 +79,9 @@ class Dovecot(base.Installer): "modoboa_dbpassword": self.config.get("modoboa", "dbpassword"), "protocols": 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 diff --git a/modoboa_installer/scripts/files/radicale/config.tpl b/modoboa_installer/scripts/files/radicale/config.tpl index a4285a4..50e7acf 100644 --- a/modoboa_installer/scripts/files/radicale/config.tpl +++ b/modoboa_installer/scripts/files/radicale/config.tpl @@ -85,7 +85,7 @@ type = radicale_dovecot_auth # Incorrect authentication delay (seconds) #delay = 1 -auth_socket = %{radicale_auth_socket_path} +auth_socket = %{auth_socket_path} [rights] diff --git a/modoboa_installer/scripts/radicale.py b/modoboa_installer/scripts/radicale.py index 5b4fc75..a65f1a7 100644 --- a/modoboa_installer/scripts/radicale.py +++ b/modoboa_installer/scripts/radicale.py @@ -44,7 +44,7 @@ class Radicale(base.Installer): radicale_auth_socket_path = self.config.get( "dovecot", "radicale_auth_socket_path") context.update({ - "radicale_auth_socket_path": radicale_auth_socket_path + "auth_socket_path": radicale_auth_socket_path }) return context