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

Merge pull request #23 from downtownallday/fix-move-postfix-queue

Browse Source 
Fix move postfix queue
This commit is contained in:
Downtown Allday 2023-10-06 06:17:04 -04:00 committed by GitHub
commit 86b030b803
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
setup/mail-users.sh
View File

@ -29,6 +29,9 @@ source ${STORAGE_ROOT}/ldap/miab_ldap.conf # user-data specific vars
dovecot_setting() { dovecot_setting() {
/usr/bin/doveconf $1 2>/dev/null | awk -F= '{gsub(/^ +/, "", $2); print $2}' /usr/bin/doveconf $1 2>/dev/null | awk -F= '{gsub(/^ +/, "", $2); print $2}'
} }
postfix_setting() {
/usr/sbin/postconf $1 2>/dev/null | awk -F= '{gsub(/^ +/, "", $2); print $2}'
}
# ### User Authentication # ### User Authentication
@ -101,7 +104,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. # Have Dovecot provide an authorization service that Postfix can access & use.
cat > /etc/dovecot/conf.d/99-local-auth.conf << EOF; cat > /etc/dovecot/conf.d/99-local-auth.conf << EOF;
service auth { service auth {
unix_listener auth-postfix { unix_listener $(postfix_setting queue_directory)/private/auth {
mode = 0660 mode = 0660
user = dovecot user = dovecot
group = postfix group = postfix
@ -117,7 +120,7 @@ EOF
# submission port. # submission port.
tools/editconf.py /etc/postfix/main.cf \ tools/editconf.py /etc/postfix/main.cf \
smtpd_sasl_type=dovecot \ smtpd_sasl_type=dovecot \
smtpd_sasl_path=$(dovecot_setting base_dir)/auth-postfix \ smtpd_sasl_path=private/auth \
smtpd_sasl_auth_enable=no smtpd_sasl_auth_enable=no
# ### Sender Validation # ### Sender Validation

9
setup/mods.available/move-postfix-queue-to-user-data.sh
View File

@ -55,7 +55,14 @@ change_queue_directory() {
mkdir -p "$(dirname "$where")" mkdir -p "$(dirname "$where")"
mv "$cur" "$where" mv "$cur" "$where"
/usr/sbin/postconf -e "queue_directory=$where" /usr/sbin/postconf -e "queue_directory=$where"
systemctl start postfix
# change rsyslog so chrooted postfix services can log at the
# new location
tools/editconf.py /etc/rsyslog.d/postfix.conf -s "\$AddUnixListenSocket=$where/dev/log"
systemctl restart rsyslog
# re-run setup/mail-users.sh so the new queue_directory is used
source setup/mail-users.sh
echo "New postfix queue directory: $where (was: $cur)" echo "New postfix queue directory: $where (was: $cur)"
} }