diff --git a/docker-compose.yml b/docker-compose.yml index e047417..ad77545 100755 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -75,6 +75,7 @@ services: - ./cron/rspamd-learn:/etc/cron.d/rspamd-learn:ro - ${SASLAUTHD_SOCKET_FILE}:/var/run/saslauthd/mux environment: + CONTAINER_NETWORK_V4: 10.222.222.0/28 TZ: UTC OVERRIDE_HOSTNAME: ${OVERRIDE_HOSTNAME} ENABLE_MTA_STS: "1" @@ -364,6 +365,7 @@ networks: ipam: driver: default config: + # See: __add_to_postfix_mynetworks in user-patches - subnet: 10.222.222.0/28 ip_range: 10.222.222.0/28 gateway: 10.222.222.14 diff --git a/user-patches.sh b/user-patches.sh index 6052dd3..df3030c 100755 --- a/user-patches.sh +++ b/user-patches.sh @@ -29,6 +29,11 @@ printf '\nsmtpd_tls_received_header = yes\n' "localhost" >> /etc/postfix/main.cf sed -i '/^smtp_helo_name =/d' /etc/postfix/main.cf printf '\nsmtp_helo_name = %s\n' "${OVERRIDE_HOSTNAME}" >> /etc/postfix/main.cf +echo "Allow this network (${CONTAINER_NETWORK_V4})" + +source /usr/local/bin/setup.d/networking.sh +__add_to_postfix_mynetworks 'Container network' "${CONTAINER_NETWORK_V4}" + echo 'Add spam check config' cat < /etc/amavis/conf.d/05-domain_id @@ -273,4 +278,7 @@ else rm -fv /etc/dovecot/conf.d/10-replication.conf fi +echo 'Chmod postfix maildrop' +chmod 777 /var/mail-state/spool-postfix/maildrop/ + echo ">>>>>>>>>>>>>>>>>>>>>>>Finished applying patches<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<"