Commit b11e081e authored by Paul Cammish's avatar Paul Cammish
Browse files

Merge branch 'cherry-pick-1269d3df' into 'bullseye'

Fix for issue317

See merge request !240
parents f352bfb1 2f498c5c
CHANGELOG
---------
2021-09-21
sympl-mail:
* Deal with aliases correctly when no mailboxes directory exists
2021-08-19
all:
* Debian Bullseye Release
core:
sympl-core:
* Updates to MOTD and banners
2021-08-18
......
sympl-mail (11.20210921.1) stable; urgency=medium
* Deal with mail correctly when no mailboxes directory exists, fixes #317
-- Paul Cammish <sympl@kelduum.net> Tue, 21 Sep 2021 13:58:00 +0100
sympl-mail (11.20210818.1) stable; urgency=medium
* Debian Bullseye Release
......
......@@ -5,7 +5,7 @@ vhost_forward:
domains = +vhost_domains
local_part_suffix = +*
local_part_suffix_optional
local_parts = ${lookup{$local_part}dsearch{VHOST_DIR/$domain_data/VHOST_MAILBOX_DIR}}
local_parts = ${if exists {VHOST_DIR/$domain/VHOST_MAILBOX_DIR}{${lookup{$local_part}dsearch{VHOST_DIR/$domain_data/VHOST_MAILBOX_DIR}}}{}}
# Make sure the files exists to avoid awkward failures
condition = ${if exists{VHOST_DIR/$domain/VHOST_MAILBOX_DIR/$local_part/forward}}
file = VHOST_DIR/$domain_data/VHOST_MAILBOX_DIR/$local_part_data/forward
......
......@@ -6,7 +6,7 @@ vhost_mailbox:
local_part_suffix = +*
local_part_suffix_optional
# Define local_parts, which fills in local_part_data
local_parts = dsearch;VHOST_DIR/$domain_data/VHOST_MAILBOX_DIR
local_parts = ${if exists {VHOST_DIR/$domain/VHOST_MAILBOX_DIR}{dsearch;VHOST_DIR/$domain_data/VHOST_MAILBOX_DIR}{}}
condition = ${if exists{VHOST_DIR/$domain/VHOST_MAILBOX_DIR/$local_part/}}
# Set the home directory for any routers/transports.
router_home_directory = VHOST_DIR/$domain_data/VHOST_MAILBOX_DIR/$local_part_data
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment