Option for an Alternate Submission Port

Dockerfile

@@ -68,5 +68,4 @@ WORKDIR    /tmp
 
 HEALTHCHECK --interval=30s --timeout=5s --start-period=10s --start-interval=2s --retries=3 CMD /scripts/healthcheck.sh
 
-EXPOSE     587
 CMD        [ "/bin/sh", "-c", "/scripts/run.sh" ]

README.md

@@ -215,6 +215,7 @@ To change the log format, set the (unsurprisingly named) variable `LOG_FORMAT=js
   issue a notice when that happens.
 - `MASQUERADED_DOMAINS` = domains where you want to masquerade internal hosts
 - `SMTP_HEADER_CHECKS`= Set to `1` to enable header checks of to a location of the file for header checks
+- `ALT_SUBMISSION_PORT` = Set to port if you need something different than default 587.  Example: `8587`
 - `POSTFIX_myhostname` = Set the name of this postfix server
 - `POSTFIX_mynetworks` = Allow sending mails only from specific networks ( default `127.0.0.0/8,10.0.0.0/8,172.16.0.0/12,192.168.0.0/16` )
 - `POSTFIX_message_size_limit` = The maximum size of the message, in bytes, by default it's unlimited

configs/master.cf

@@ -9,7 +9,7 @@
 # service type  private unpriv  chroot  wakeup  maxproc command + args
 #               (yes)   (yes)   (no)    (never) (100)
 # ==========================================================================
-smtp      inet  n       -       n       -       -       smtpd
+#smtp      inet  n       -       n       -       -       smtpd
 #smtp      inet  n       -       n       -       1       postscreen
 #smtpd     pass  -       -       n       -       -       smtpd
 #dnsblog   unix  -       -       n       -       0       dnsblog

scripts/common-run.sh

@@ -738,6 +738,15 @@ postfix_open_submission_port() {
 	sed -i -r -e 's/^#submission/submission/' /etc/postfix/master.cf
 }
 
+postfix_set_alt_submission_port() {
+	if [ ! -z "$ALT_SUBMISSION_PORT" ]; then
+        notice "ALT_SUBMISSION_PORT is ${emphasis}$ALT_SUBMISSION_PORT${reset}"
+		sed -i -r -e 's/^submission/#submission/' /etc/postfix/master.cf
+		sed -i '/^#submission.*/a\
+8587 inet n       y       n       -       -       smtpd'$'\n' /etc/postfix/master.cf
+	fi
+}
+
 execute_post_init_scripts() {
 	if [ -d /docker-init.db/ ]; then
 		notice "Executing any found custom scripts..."

scripts/healthcheck.sh

@@ -5,9 +5,17 @@ if [ -f /tmp/container_is_terminating ]; then
 fi
 
 check_postfix() {
+    port=$(grep -v '^#' /etc/postfix/master.cf | grep 'submission inet')
+    if [ -n "$port" ]; then
+        port=587
+        echo "Submission port is: $port"
+    else
+        port=$(grep -E '^[^#].*smtpd$' /etc/postfix/master.cf | awk '{print $1}')
+        echo "Submission port is: $port"
+    fi
     printf "EHLO healthcheck\nquit\n" | \
     { while read l ; do sleep 1; echo $l; done } | \
-    nc -w 2 127.0.0.1 587 | \
+    nc -w 2 127.0.0.1 $port | \
     grep -qE "^220.*ESMTP Postfix"
 }
 

scripts/run.sh

@@ -38,6 +38,7 @@ postfix_setup_smtpd_sasl_auth           # Enable sender sasl auth, if defined
 postfix_custom_commands                 # Apply custom postfix settings
 opendkim_custom_commands                # Apply custom OpenDKIM settings
 postfix_open_submission_port            # Enable the submission port
+postfix_set_alt_submission_port         # Set the alternative submission port
 execute_post_init_scripts               # Execute any scripts found in /docker-init.db/
 unset_sensitive_variables               # Remove environment variables that contains sensitive values (secrets) that are read from conf files