Changed the name of the postfix config we load at runtime, from

main.cf to runtime.main.cf.
That should clarify the use of that file, i.e. for runtime changes
to postfix config.

Makefile

@@ -9,7 +9,7 @@ build:
 run:
 	# Copy test files
 	cp -a test/accounts-db/ postfix/
-	cp test/main.cf postfix/
+	cp test/runtime.main.cf postfix/
 	cp test/virtual postfix/
 	# Run containers
 	docker run -d --name mail \
@@ -63,5 +63,6 @@ tests:
 clean:
 	# Get default files back
 	git checkout postfix/accounts-db postfix/main.cf postfix/virtual
+	rm -f postfix/runtime.main.cf
 	# Remove running test containers
 	docker rm -f mail mail_pop3 mail_smtponly mail_fail2ban

start-mailserver.sh

@@ -230,13 +230,13 @@ case $DMS_SSL in
 
 esac
 
-if [ -f /tmp/postfix/main.cf ]; then
+if [ -f /tmp/postfix/runtime.main.cf ]; then
   while read line; do
     postconf -e "$line"
-  done < /tmp/postfix/main.cf
-  echo "Loaded '/tmp/postfix/main.cf'"
+  done < /tmp/postfix/runtime.main.cf
+  echo "Loaded '/tmp/postfix/runtime.main.cf'"
 else
-  echo "'/tmp/postfix/main.cf' not provided. No extra postfix settings loaded."
+  echo "'/tmp/postfix/runtime.main.cf' not provided. No extra postfix settings loaded."
 fi
 
 if [ ! -z "$SASL_PASSWORD" ]; then

test/tests.bats

@@ -245,10 +245,10 @@
   [ "${lines[1]}" = "otherdomain.tld" ]
 }
 
-@test "checking postfix: main.cf overrides" {
-  run docker exec mail grep -q 'max_idle = 600s' /tmp/postfix/main.cf
+@test "checking postfix: runtime.main.cf overrides" {
+  run docker exec mail grep -q 'max_idle = 600s' /tmp/postfix/runtime.main.cf
   [ "$status" -eq 0 ]
-  run docker exec mail grep -q 'readme_directory = /tmp' /tmp/postfix/main.cf
+  run docker exec mail grep -q 'readme_directory = /tmp' /tmp/postfix/runtime.main.cf
   [ "$status" -eq 0 ]
 }