From f9f39d771597e6c9340c2bb1a5b24061dfa3fb35 Mon Sep 17 00:00:00 2001
From: downtownallday <downtownallday@gmail.com>
Date: Thu, 5 Oct 2023 17:57:46 -0400
Subject: [PATCH 1/2] Move dovecot auth socket location from postfix's
 directory to dovecot's

---
 setup/mail-users.sh | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/setup/mail-users.sh b/setup/mail-users.sh
index a92dd2bd..3c70024b 100755
--- a/setup/mail-users.sh
+++ b/setup/mail-users.sh
@@ -26,6 +26,10 @@ source setup/functions.sh # load our functions
 source /etc/mailinabox.conf # load global vars
 source ${STORAGE_ROOT}/ldap/miab_ldap.conf # user-data specific vars
 
+dovecot_setting() {
+    /usr/bin/doveconf $1 2>/dev/null | awk -F= '{gsub(/^ +/, "", $2); print $2}'
+}
+
 # ### User Authentication
 
 # Have Dovecot query our database, and not system users, for authentication.
@@ -97,7 +101,7 @@ ln -sf /etc/dovecot/dovecot-ldap.conf.ext /etc/dovecot/dovecot-userdb-ldap.conf.
 # Have Dovecot provide an authorization service that Postfix can access & use.
 cat > /etc/dovecot/conf.d/99-local-auth.conf << EOF;
 service auth {
-  unix_listener /var/spool/postfix/private/auth {
+  unix_listener auth-postfix {
     mode = 0666
     user = postfix
     group = postfix
@@ -113,7 +117,7 @@ EOF
 # submission port.
 tools/editconf.py /etc/postfix/main.cf \
 	smtpd_sasl_type=dovecot \
-	smtpd_sasl_path=private/auth \
+	smtpd_sasl_path=$(dovecot_setting base_dir)/auth-postfix \
 	smtpd_sasl_auth_enable=no
 
 # ### Sender Validation

From bc2bc02a57ac89dc52f1379f9a4d56f9c9b27dda Mon Sep 17 00:00:00 2001
From: downtownallday <downtownallday@gmail.com>
Date: Thu, 5 Oct 2023 17:58:26 -0400
Subject: [PATCH 2/2] Add a setup mod to move postfix queue to /home/user-data

---
 .../move-postfix-queue-to-user-data.sh        | 71 +++++++++++++++++++
 1 file changed, 71 insertions(+)
 create mode 100755 setup/mods.available/move-postfix-queue-to-user-data.sh

diff --git a/setup/mods.available/move-postfix-queue-to-user-data.sh b/setup/mods.available/move-postfix-queue-to-user-data.sh
new file mode 100755
index 00000000..5cfed112
--- /dev/null
+++ b/setup/mods.available/move-postfix-queue-to-user-data.sh
@@ -0,0 +1,71 @@
+#!/bin/bash
+
+#####
+##### This file is part of Mail-in-a-Box-LDAP which is released under the
+##### terms of the GNU Affero General Public License as published by the
+##### Free Software Foundation, either version 3 of the License, or (at
+##### your option) any later version. See file LICENSE or go to
+##### https://github.com/downtownallday/mailinabox-ldap for full license
+##### details.
+#####
+
+#
+# This setup mod script configures postfix to queue incoming messages
+# into /home/user-data/mail/spool/postfix instead of the default
+# /var/spool/postfix. The benefits of doing this are:
+#
+#   1. It will ensure nightly backups include queued, but undelivered, mail
+#   2. If you maintain a separate filesystem for /home/user-data, this
+#      will get the queue off the root filesystem
+#
+# created: 2023-10-06 author: downtownallday
+#
+# Install instructions
+# ====================
+# From the mailinabox directory, run the following commands as root:
+#
+#   1. setup/enmod.sh move-postfix-queue-to-user-data
+#   2. run either `setup/start.sh` or `ehdd/start-encrypted.sh` (if using
+#      encryption-at-rest)
+#
+# Removal
+# =======
+# From the mailinabox directory, run the following commands as root:
+#
+#   1. local/move-postfix-queue-to-user-data.sh remove
+#   2. rm local/move-postfix-queue-to-user-data.sh`)
+#
+
+[ -e /etc/mailinabox.conf ] && source /etc/mailinabox.conf
+[ -e /etc/cloudinabox.conf ] && source /etc/cloudinabox.conf
+. setup/functions.sh
+
+
+change_queue_directory() {
+    local where="$1"
+    local cur
+    cur=$(/usr/sbin/postconf -p queue_directory | awk -F= '{gsub(/^ +/, "", $2); print $2}')
+    if [ "$cur" = "$where" ]; then
+        echo "Postfix queue directory: $cur (no change)"
+        return 0
+    fi
+    echo "Moving postfix queue directory to $where"
+    systemctl stop postfix
+    rm -rf "$where"
+    mkdir -p "$(dirname "$where")"
+    mv "$cur" "$where"
+    /usr/sbin/postconf -e "queue_directory=$where"
+    systemctl start postfix
+    echo "New postfix queue directory: $where (was: $cur)"
+}
+
+
+if [ "${1:-}" = "remove" ]; then
+    change_queue_directory /var/spool/postfix
+else
+    if [ ! -d "$STORAGE_ROOT/mail" ]; then
+        echo "Error! $STORAGE_ROOT/mail does not exist!"
+        exit 1
+    fi
+    change_queue_directory $STORAGE_ROOT/mail/spool/postfix
+fi