Update Maildir path in entrypoint script and Docker Compose configuration

Author: seanthegeek

deploy/postfix/entrypoint.sh

@@ -28,7 +28,11 @@ fi
 envsubst '$MSP_DOMAIN $TLS_CONFIG' < /etc/postfix/main.cf.template > /etc/postfix/main.cf
 chmod 644 /etc/postfix/main.cf
 
-# Ensure Maildir ownership (volume may be freshly created)
+# Ensure Maildir structure exists and is owned by dmarc (volume may be
+# freshly created, or parsedmarc may have created dirs as a different UID)
+mkdir -p /var/mail/dmarc/Maildir/new \
+         /var/mail/dmarc/Maildir/cur \
+         /var/mail/dmarc/Maildir/tmp
 chown -R dmarc:dmarc /var/mail/dmarc
 chmod 700 /var/mail/dmarc
 

dmarc_msp/cli/retention.py

@@ -14,7 +14,7 @@
 
 @app.command("cleanup-emails")
 def cleanup_emails(
-    maildir: str = typer.Option("/var/mail/dmarc", "--maildir", help="Path to Maildir"),
+    maildir: str = typer.Option("/var/mail/dmarc/Maildir", "--maildir", help="Path to Maildir"),
     config: str | None = typer.Option(None, "--config", "-c"),
 ):
     """Delete processed email files older than retention.email_days."""

docker-compose.yml

@@ -28,7 +28,7 @@ services:
       - PARSEDMARC_GENERAL_SAVE_FORENSIC=true
       - PARSEDMARC_GENERAL_SAVE_SMTP_TLS=true
       - PARSEDMARC_GENERAL_INDEX_PREFIX_DOMAIN_MAP=/etc/parsedmarc_domain_map.yaml
-      - PARSEDMARC_MAILDIR_MAILDIR_PATH=/var/mail/dmarc
+      - PARSEDMARC_MAILDIR_MAILDIR_PATH=/var/mail/dmarc/Maildir
       - PARSEDMARC_MAILDIR_CREATE=true
       - PARSEDMARC_MAILBOX_WATCH=true
       - PARSEDMARC_MAILBOX_DELETE=false