diff --git a/docker-compose.yml b/docker-compose.yml index 497a501a..bc99b5e9 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -47,7 +47,7 @@ services: volumes: - /freeposte/freeposte:/data - /freeposte/certs:/certs - - /freeposte/config/postfix:/config + - /freeposte/overrides:/overrides milter: build: rmilter diff --git a/postfix/start.sh b/postfix/start.sh index 17c7e43b..c0931433 100755 --- a/postfix/start.sh +++ b/postfix/start.sh @@ -6,25 +6,25 @@ for VARIABLE in `env | cut -f1 -d=`; do done # Override Postfix configuration -if [ -f /config/main.cf ]; then +if [ -f /overrides/postfix.cf ]; then while read line; do postconf -e "$line" - done < /config/main.cf - echo "Loaded 'config/main.cf'" + done < /overrides/postfix.cf + echo "Loaded '/overrides/postfix.cf'" else - echo "No extra postfix settings loaded because optional '/config/main.cf' not provided." + echo "No extra postfix settings loaded because optional '/overrides/postfix.cf' not provided." fi # Include table-map files -if ls -A /config/*.map 1> /dev/null 2>&1; then - cp /config/*.map /etc/postfix/ +if ls -A /overrides/*.map 1> /dev/null 2>&1; then + cp /overrides/*.map /etc/postfix/ postmap /etc/postfix/*.map rm /etc/postfix/*.map chown root:root /etc/postfix/*.db chmod 0600 /etc/postfix/*.db echo "Loaded 'map files'" else - echo "No extra map files loaded because optional '/config/*.map' not provided." + echo "No extra map files loaded because optional '/overrides/*.map' not provided." fi # Actually run Postfix