From 95492f41bd66ec9669fa43c211ff6818a66d8484 Mon Sep 17 00:00:00 2001
From: Akuario <jkarlos.b@gmail.com>
Date: Mon, 1 Aug 2016 10:29:15 +0200
Subject: [PATCH] Added config folder for Postfix

---
 docker-compose.yml   |  1 +
 postfix/conf/main.cf |  6 +++++-
 postfix/start.sh     | 19 +++++++++++++++++++
 3 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 9a3a9cb0..497a501a 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -47,6 +47,7 @@ services:
     volumes:
       - /freeposte/freeposte:/data
       - /freeposte/certs:/certs
+      - /freeposte/config/postfix:/config
 
   milter:
     build: rmilter
diff --git a/postfix/conf/main.cf b/postfix/conf/main.cf
index 97ac8b13..6cbeca97 100644
--- a/postfix/conf/main.cf
+++ b/postfix/conf/main.cf
@@ -48,4 +48,8 @@ lmtp_host_lookup = native
 smtpd_milters = inet:milter:9900
 milter_protocol = 6
 milter_mail_macros = i {mail_addr} {client_addr} {client_name} {auth_authen}
-milter_default_action = tempfail
\ No newline at end of file
+milter_default_action = tempfail
+
+###############
+# Extra Settings
+###############
diff --git a/postfix/start.sh b/postfix/start.sh
index 7891be74..c8af059c 100755
--- a/postfix/start.sh
+++ b/postfix/start.sh
@@ -5,6 +5,25 @@ for VARIABLE in `env | cut -f1 -d=`; do
   sed -i "s={{ $VARIABLE }}=${!VARIABLE}=g" /etc/postfix/*.cf
 done
 
+# Override Postfix configuration
+if [ -f /config/main.cf ]; then
+  while read line; do
+    postconf -e "$line"
+  done < /config/main.cf
+  echo "Loaded 'config/main.cf'"
+else
+  echo "No extra postfix settings loaded because optional '/config/main.cf' not provided."
+fi
+
+# Include table-map files
+if [ "$(ls -A /config/*.map)" ]; then
+  cp /config/*.map /etc/postfix/
+  postmap /etc/postfix/*.map
+  rm /etc/postfix/*.map
+  chown root:root /etc/postfix/*.db
+  chmod 0600 /etc/postfix/*.db
+fi
+
 # Actually run Postfix
 rm -f /var/run/rsyslogd.pid
 /usr/lib/postfix/master &