From 0f35a4ee9f4586428a0c3d11d9bc1a9ee1c4b7b4 Mon Sep 17 00:00:00 2001 From: Deon George Date: Thu, 24 Apr 2025 14:13:19 +1000 Subject: [PATCH] Fixes because I think we need a comma between map items --- docker/init-docker | 4 ++-- include/40-relay.cf | 6 ++---- include/41-virtual.cf | 6 ++---- 3 files changed, 6 insertions(+), 10 deletions(-) diff --git a/docker/init-docker b/docker/init-docker index d777c5e..dcd786b 100755 --- a/docker/init-docker +++ b/docker/init-docker @@ -74,8 +74,8 @@ if [ -z "$@" ]; then postmap -o lmdb:${CUSTOM}/virtual_mailbox_maps # Create some default LDAP templates - if [ -n "${LDAP_SEARCH_BASE}" ]; then - sed -i -e "s%^# ldap:% ldap:%" ${POSTFIX}/main.cf + if [ -n "${LDAP_SEARCH_BASE}" ]; then + sed -i -e "s% # ldap:%, ldap:%" ${POSTFIX}/main.cf if [ ! -f ${CUSTOM}/ldap_virtual_alias_maps ]; then cp ${DEFAULTS}/ldap_virtual_alias_maps ${CUSTOM}/ diff --git a/include/40-relay.cf b/include/40-relay.cf index ab8654b..1532b37 100644 --- a/include/40-relay.cf +++ b/include/40-relay.cf @@ -1,8 +1,6 @@ #relayhost = /etc/postfix/custom/relay_host -relay_domains = lmdb:/etc/postfix/custom/relay_domains -# ldap:/etc/postfix/custom/ldap_relay_domains -relay_recipient_maps = lmdb:/etc/postfix/custom/relay_recipient_maps -# ldap:/etc/postfix/custom/ldap_relay_recipient_maps +relay_domains = lmdb:/etc/postfix/custom/relay_domains # ldap:/etc/postfix/custom/ldap_relay_domains +relay_recipient_maps = lmdb:/etc/postfix/custom/relay_recipient_maps # ldap:/etc/postfix/custom/ldap_relay_recipient_maps transport_maps = lmdb:/etc/postfix/custom/relay_domains #transport_maps = $relay_domains #relay_transport = lmdb:/etc/postfix/custom/relay_domains <-- THIS DOESNT WORK? diff --git a/include/41-virtual.cf b/include/41-virtual.cf index 8eb68a5..289bc26 100644 --- a/include/41-virtual.cf +++ b/include/41-virtual.cf @@ -1,15 +1,13 @@ #virtual_alias_domains = @VIRTUAL_ALIAS_DOMAINS@ ##virtual_alias_domains = lmdb:/etc/postfix/custom/virtual_alias_domains ## ldap:/etc/postfix/custom/ldap_virtual_mailbox_domains -virtual_alias_maps = lmdb:/etc/postfix/custom/virtual_alias_maps -# ldap:/etc/postfix/custom/ldap_virtual_alias_maps +virtual_alias_maps = lmdb:/etc/postfix/custom/virtual_alias_maps # ldap:/etc/postfix/custom/ldap_virtual_alias_maps virtual_mailbox_base = /var/mail/vhosts #virtual_mailbox_domains = @VIRTUAL_DOMAINS@ ## @note virtual_mailbox_domains cannot be a map, so the below two definitions *WONT* work ##virtual_mailbox_domains = lmdb:/etc/postfix/custom/virtual_mailbox_domains ## ldap:/etc/postfix/custom/ldap_virtual_mailbox_domains -virtual_mailbox_maps = lmdb:/etc/postfix/custom/virtual_mailbox_maps -# ldap:/etc/postfix/custom/ldap_virtual_mailbox_maps +virtual_mailbox_maps = lmdb:/etc/postfix/custom/virtual_mailbox_maps # ldap:/etc/postfix/custom/ldap_virtual_mailbox_maps #virtual_transport = virtual virtual_minimum_uid = 100 virtual_uid_maps = static:5000