From a88b7ce2f333ba1fd7428bcfacb6642492f019a3 Mon Sep 17 00:00:00 2001
From: alinmear <alinmear@users.noreply.github.com>
Date: Sat, 1 Jul 2017 21:25:28 +0200
Subject: [PATCH] Fix erroneous removal of an conditional within the postfix
 override function

---
 target/start-mailserver.sh | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/target/start-mailserver.sh b/target/start-mailserver.sh
index e3147e12..b99ab53d 100644
--- a/target/start-mailserver.sh
+++ b/target/start-mailserver.sh
@@ -353,7 +353,7 @@ function override_config() {
 	    do
 		[ -z $key ] && echo -e "\t no key provided" && return 1
 
-		sed -i -e "s|^${key}[[:space:]]\+.*|${key} = ${config_overrides[$key]//&/\\&}|g" \
+		sed -i -e "s|^${key}[[:space:]]\+.*|g${key} = ${config_overrides[$key]//&/\\&}|g" \
 		    ${f}
 	    done
 	fi
@@ -913,6 +913,16 @@ function _setup_postfix_override_configuration() {
 	else
 		notify 'inf' "No extra postfix settings loaded because optional '/tmp/docker-mailserver/postfix-main.cf' not provided."
 	fi
+	if [ -f /tmp/docker-mailserver/postfix-master.cf ]; then
+		while read line; do
+		if [[ "$line" =~ ^[a-z] ]]; then
+			postconf -P "$line"
+		fi
+		done < /tmp/docker-mailserver/postfix-master.cf
+		notify 'inf' "Loaded 'config/postfix-master.cf'"
+	else
+		notify 'inf' "No extra postfix settings loaded because optional '/tmp/docker-mailserver/postfix-master.cf' not provided."
+	fi
 }
 
 function _setup_postfix_sasl_password() {