adrien/infrastructure
1
0
Fork 0
forked from Deuxfleurs/infrastructure
Code Issues Pull requests Releases Wiki Activity

Finally fix dovecot

Browse source
This commit is contained in:
Quentin 2021-09-14 14:02:50 +02:00
parent a2a25e2ea4
commit 6716687fd7
Signed by untrusted user: quentin
GPG key ID: A98E9B769E4FF428
6 changed files with 28 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/directory/deploy/directory.hcl
View file

@ -69,7 +69,7 @@ job "directory" {
task "guichet" { task "guichet" {
driver = "docker" driver = "docker"
config { config {
image = "lxpz/guichet_amd64:14" image = "superboum/guichet_amd64:15"
readonly_rootfs = true readonly_rootfs = true
ports = [ "web_port" ] ports = [ "web_port" ]
volumes = [ volumes = [

5
app/docker-compose.yml
View file

@ -36,6 +36,11 @@ services:
VERSION: 9bafa64b9d VERSION: 9bafa64b9d
image: superboum/amd64_alps:v1 image: superboum/amd64_alps:v1
dovecot:
build:
context: ./email/build/dovecot
image: superboum/amd64_dovecot:v5
# VoIP # VoIP
jitsi-meet: jitsi-meet:
build: build:

2
app/email/build/dovecot/Dockerfile
View file

@ -1,4 +1,4 @@
FROM amd64/debian:stretch FROM amd64/debian:bullseye
RUN apt-get update && \ RUN apt-get update && \
apt-get install -y \ apt-get install -y \

24
app/email/build/dovecot/conf/dovecot.conf
View file

@ -19,10 +19,7 @@ service auth {
} }
} }
passdb {
args = /etc/dovecot/dovecot-ldap.conf
driver = ldap
}
service lmtp { service lmtp {
inet_listener lmtp { inet_listener lmtp {
@ -31,6 +28,20 @@ service lmtp {
} }
} }
# https://doc.dovecot.org/configuration_manual/authentication/ldap_authentication/
passdb {
args = /etc/dovecot/dovecot-ldap.conf
driver = ldap
}
userdb {
driver = prefetch
}
userdb {
args = /etc/dovecot/dovecot-ldap.conf
driver = ldap
}
service imap-login { service imap-login {
inet_listener imap { inet_listener imap {
port = 143 port = 143
@ -40,11 +51,6 @@ service imap-login {
} }
} }
userdb {
args = uid=mailstore gid=mailstore home=/var/mail/%u
driver = static
}
protocol imap { protocol imap {
mail_plugins = $mail_plugins imap_sieve mail_plugins = $mail_plugins imap_sieve
} }

6
app/email/config/dovecot/dovecot-ldap.conf.tpl
View file

@ -5,4 +5,8 @@ base = dc=deuxfleurs,dc=fr
scope = subtree scope = subtree
user_filter = (&(mail=%u)(&(objectClass=inetOrgPerson)(memberOf=cn=email,ou=groups,dc=deuxfleurs,dc=fr))) user_filter = (&(mail=%u)(&(objectClass=inetOrgPerson)(memberOf=cn=email,ou=groups,dc=deuxfleurs,dc=fr)))
pass_filter = (&(mail=%u)(&(objectClass=inetOrgPerson)(memberOf=cn=email,ou=groups,dc=deuxfleurs,dc=fr))) pass_filter = (&(mail=%u)(&(objectClass=inetOrgPerson)(memberOf=cn=email,ou=groups,dc=deuxfleurs,dc=fr)))
user_attrs = mail=/var/mail/%{ldap:cn} user_attrs = \
=user=%{ldap:cn}, \
=mail=maildir:/var/mail/%{ldap:cn}, \
=uid=1000, \
=gid=1000

2
app/email/deploy/email.hcl
View file

@ -29,7 +29,7 @@ job "email" {
driver = "docker" driver = "docker"
config { config {
image = "superboum/amd64_dovecot:v2" image = "superboum/amd64_dovecot:v5"
readonly_rootfs = false readonly_rootfs = false
ports = [ "zauthentication_port", "imaps_port", "imap_port", "lmtp_port" ] ports = [ "zauthentication_port", "imaps_port", "imap_port", "lmtp_port" ]
command = "dovecot" command = "dovecot"