diff options
| author | Elizabeth Alexander Hunt <me@liz.coffee> | 2025-05-07 18:10:57 -0700 |
|---|---|---|
| committer | Elizabeth Alexander Hunt <me@liz.coffee> | 2025-05-07 18:10:57 -0700 |
| commit | b8ffbfe27eae919750ef4d3facf02393d1004287 (patch) | |
| tree | 78a22cffd1a387a1f482aac78a93fb951dcc81bb /playbooks/roles/mail/templates | |
| parent | 59417f290463d3aabbf3ec2ab8e75703928db217 (diff) | |
| download | infra-b8ffbfe27eae919750ef4d3facf02393d1004287.tar.gz infra-b8ffbfe27eae919750ef4d3facf02393d1004287.zip | |
.git was corrupted on the machine i worked on these many commits. so here it is all at once :P
Diffstat (limited to 'playbooks/roles/mail/templates')
| -rw-r--r-- | playbooks/roles/mail/templates/stacks/docker-compose.yml | 6 | ||||
| -rw-r--r-- | playbooks/roles/mail/templates/volumes/data/dms/config/dovecot-ldap.conf | 2 |
2 files changed, 3 insertions, 5 deletions
diff --git a/playbooks/roles/mail/templates/stacks/docker-compose.yml b/playbooks/roles/mail/templates/stacks/docker-compose.yml index 38e63cb..d7f8984 100644 --- a/playbooks/roles/mail/templates/stacks/docker-compose.yml +++ b/playbooks/roles/mail/templates/stacks/docker-compose.yml @@ -1,7 +1,6 @@ services: roundcube: image: roundcube/roundcubemail:latest - restart: always volumes: - {{ mail_base }}/volumes/data/roundcube/db:/var/roundcube/db - {{ mail_base }}/volumes/data/roundcube/config:/var/roundcube/config/ @@ -38,9 +37,9 @@ services: mailserver: image: ghcr.io/docker-mailserver/docker-mailserver:latest hostname: {{ mail_domain }} +{% if homelab_build %} command: - /scripts/wait-for-cert.sh -{% if homelab_build %} healthcheck: disable: true {% else %} @@ -59,7 +58,6 @@ services: - '4190:4190' - '110:110' - '995:995' - stop_grace_period: 30s deploy: mode: replicated replicas: 1 @@ -104,8 +102,6 @@ services: - SASLAUTHD_MECHANISMS=rimap - SASLAUTHD_MECH_OPTIONS=127.0.0.1 - - DOVECOT_USER_FILTER={{ dovecot_user_filter }} - - ENABLE_OAUTH2=1 - OAUTH2_INTROSPECTION_URL={{ roundcube_oauth2_user_uri }} diff --git a/playbooks/roles/mail/templates/volumes/data/dms/config/dovecot-ldap.conf b/playbooks/roles/mail/templates/volumes/data/dms/config/dovecot-ldap.conf index 6a14553..e55a861 100644 --- a/playbooks/roles/mail/templates/volumes/data/dms/config/dovecot-ldap.conf +++ b/playbooks/roles/mail/templates/volumes/data/dms/config/dovecot-ldap.conf @@ -8,3 +8,5 @@ dnpass = {{ email_ldap_api_token }} auth_bind = yes auth_bind_userdn = {{ dovecot_auth_bind_userdn }} +user_filter = {{ dovecot_user_filter }} +pass_filter = {{ dovecot_user_filter }} |