external/mailinabox
1
0
Fork 0
mirror of https://github.com/mail-in-a-box/mailinabox.git synced 2025-04-25 03:36:56 +00:00
Code Issues Releases Wiki Activity

Merge pull request #22 from downtownallday/move-postfix-queue-to-user-data

Browse Source 
Move postfix queue to user data
This commit is contained in:
Downtown Allday 2023-10-05 18:21:30 -04:00 committed by GitHub
commit 5c4c75c111
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 77 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
setup/mail-users.sh
View File

@ -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

71
setup/mods.available/move-postfix-queue-to-user-data.sh Executable file
View File

@ -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