Merge branch 'master' of git.oopen.de:install/mailsystem

This commit is contained in:
2025-08-23 11:49:42 +02:00

View File

@ -10179,9 +10179,9 @@ if [[ $dovecot_major_version -gt 2 ]] \
read -r -d '' NEW_BLOCK <<'EOF' read -r -d '' NEW_BLOCK <<'EOF'
protocol imap { protocol imap {
mail_plugins { mail_plugins {
imap_acl = yes imap_acl = yes
} }
} }
EOF EOF
@ -10234,9 +10234,9 @@ namespace shared {
prefix = shared/$user/ prefix = shared/$user/
# Mail location setting # Mail location setting
mail_home = /var/vmail/%{user | domain}/%{user | username}
mail_driver = maildir mail_driver = maildir
mail_path = ~/Maildir mail_path = %{owner_home}/Maildir
mail_index_private_path = ~/Maildir/shared/%{owner_user} mail_index_private_path = ~/Maildir/shared/%{owner_user}
# Use the default namespace for saving subscriptions. # Use the default namespace for saving subscriptions.
@ -10273,6 +10273,27 @@ ${NEW_BLOCK}
EOF EOF
fi fi
read -r -d '' NEW_BLOCK <<'EOF'
acl_sharing_map {
dict file {
path = /var/vmail/shared-mailboxes.db
}
}
EOF
if grep -qE "^\s*acl_sharing_map\s+{" "${_conf_file}"; then
replace_code_block "acl_sharing_map" "${NEW_BLOCK}" "${_conf_file}" || _failed=true
else
cat <<EOF >> "${_conf_file}" || _failed=true
# A shared mailbox dictionary that defines which users may LIST mailboxes shared by other users.
${NEW_BLOCK}
EOF
fi
if ! $_failed ; then if ! $_failed ; then
echo -e "$rc_done" echo -e "$rc_done"