Merge branch 'release/5.8.1' into stable

.env.dist

@@ -74,7 +74,8 @@ POSTSCREEN_ACTION=enforce
 # 1 => only launch postfix smtp
 SMTP_ONLY=
 
-Please read [the SSL page in the wiki](https://github.com/tomav/docker-mailserver/wiki/Configure-SSL) for more information.
+# Please read [the SSL page in the wiki](https://github.com/tomav/docker-mailserver/wiki/Configure-SSL) for more information.
+#
 # empty => SSL disabled
 # letsencrypt => Enables Let's Encrypt certificates
 # custom => Enables custom certificates
@@ -91,7 +92,8 @@ VIRUSMAILS_DELETE_DELAY=
 # 1 => enabled
 ENABLE_POSTFIX_VIRTUAL_TRANSPORT=
 
-Enabled by ENABLE_POSTFIX_VIRTUAL_TRANSPORT. Specify the final delivery of postfix
+# Enabled by ENABLE_POSTFIX_VIRTUAL_TRANSPORT. Specify the final delivery of postfix
+#
 # empty => fail
 # `lmtp:unix:private/dovecot-lmtp` (use socket)
 # `lmtps:inet:<host>:<port>` (secure lmtp with starttls, take a look at https://sys4.de/en/blog/2014/11/17/sicheres-lmtp-mit-starttls-in-dovecot/)

CHANGELOG.md

@@ -1,5 +1,27 @@
 # Changelog
 
+## 5.8.1
+
+* add headers to postfix summary mail (#919)
+* quotes needed to run multi-word command inside
+  container (#921)
+* Fix uncommented lines in .env file (#920)
+* Tls level fix (#916)
+* test/config backup & restore (#907)
+* Restore userdb for tests (#913)
+
+## 5.8.0
+
+* Adding daily mail review from Issue 839 (#881)
+  You can enable REPORT_RECIPIENT for REPORT_INTERVAL
+  reports. Default is disabled.
+* introducing ENABLE_SRS env variable (#906, #852)
+  In v3.2.0 was SRS introduced and enabled by default
+  Now it is disabled by default and can be enabled with
+  the new env variable.
+* fixed delalias, added additional tests (#909)
+  Fixes to setup where made for deletion and addition.
+
 ## 5.7.0
 * Delmailuser (#878)
   You can now delete users and the mailbox

Makefile

@@ -1,8 +1,8 @@
 NAME = tvial/docker-mailserver:testing
 
-all: build-no-cache generate-accounts run generate-accounts-after-run fixtures tests clean
-all-fast: build generate-accounts run generate-accounts-after-run fixtures tests clean
-no-build: generate-accounts run generate-accounts-after-run fixtures tests clean
+all: build-no-cache backup generate-accounts run generate-accounts-after-run fixtures tests clean
+all-fast: build backup generate-accounts run generate-accounts-after-run fixtures tests clean
+no-build: backup generate-accounts run generate-accounts-after-run fixtures tests clean
 
 build-no-cache:
 	cd test/docker-openldap/ && docker build -f Dockerfile -t ldap --no-cache .
@@ -12,6 +12,15 @@ build:
 	cd test/docker-openldap/ && docker build -f Dockerfile -t ldap .
 	docker build -t $(NAME) .
 
+backup:
+	# if backup directories exist, clean hasn't been called, therefore we shouldn't overwrite it. It still contains the original content.
+	@if [ ! -d config.bak ]; then\
+  	cp -rp config config.bak; \
+	fi
+	@if [ ! -d testconfig.bak ]; then\
+		cp -rp test/config testconfig.bak ;\
+	fi
+
 generate-accounts:
 	docker run --rm -e MAIL_USER=user1@localhost.localdomain -e MAIL_PASS=mypassword -t $(NAME) /bin/sh -c 'echo "$$MAIL_USER|$$(doveadm pw -s SHA512-CRYPT -u $$MAIL_USER -p $$MAIL_PASS)"' > test/config/postfix-accounts.cf
 	docker run --rm -e MAIL_USER=user2@otherdomain.tld -e MAIL_PASS=mypassword -t $(NAME) /bin/sh -c 'echo "$$MAIL_USER|$$(doveadm pw -s SHA512-CRYPT -u $$MAIL_USER -p $$MAIL_PASS)"' >> test/config/postfix-accounts.cf
@@ -205,7 +214,6 @@ generate-accounts-after-run:
 	sleep 10
 
 fixtures:
-	cp -r config config.bak
 	# Setup sieve & create filtering folder (INBOX/spam)
 	docker cp "`pwd`/test/config/sieve/dovecot.sieve" mail:/var/mail/localhost.localdomain/user1/.dovecot.sieve
 	docker exec mail /bin/sh -c "maildirmake.dovecot /var/mail/localhost.localdomain/user1/.INBOX.spam"
@@ -262,16 +270,11 @@ clean:
 		mail_override_hostname
 
 	@if [ -d config.bak ]; then\
-		sudo rm -rf config ;\
+		rm -rf config ;\
 		mv config.bak config ;\
 	fi
-	-sudo rm -rf test/onedir \
-		test/config/empty \
-		test/config/keyDefault \
-		test/config/key2048 \
-		test/config/key1024 \
-		test/config/without-accounts \
-		test/config/without-virtual \
-		test/config/with-domain \
-		test/config/dovecot-lmtp/userdb \
-		test/config/postfix-*-access.cf*
+	@if [ -d testconfig.bak ]; then\
+		rm -rf test/config ;\
+		mv testconfig.bak test/config ;\
+	fi
+	-sudo rm -rf test/onedir

setup.sh

@@ -93,7 +93,7 @@ _docker_image() {
 
 _docker_container() {
   if [ -n "$CONTAINER_NAME" ]; then
-    docker exec -ti "$CONTAINER_NAME" $@
+    docker exec -ti "$CONTAINER_NAME" "$@"
   else
     echo "The docker-mailserver is not running!"
     exit 1

target/bin/postfix-summary

@@ -10,9 +10,17 @@ errex() {
 
 test -x /usr/sbin/pflogsumm || errex "Critical: /usr/sbin/pflogsumm not found"
 
-BODY="Subject: Postfix Summary for $HOSTNAME\n\n"
 # The case that the mail.log.1 file isn't readable shouldn't actually be possible with logrotate not rotating empty files.. But you never know!
 [ -r "/var/log/mail/mail.log.1" ] \
-  && BODY="$BODY"$(/usr/sbin/pflogsumm /var/log/mail/mail.log.1 --problems-first) \
-  || BODY="$BODY Error: Mail log not readable or not found: /var/log/mail/mail.log.1\n\nIn case of mail inactivity since the last report, this might be considered a nuisance warning.\n\nYours faithfully, The $HOSTNAME Mailserver"
-echo -e "$BODY" | sendmail -f "mailserver-report@$HOSTNAME" "$RECIPIENT"
+  && BODY=$(/usr/sbin/pflogsumm /var/log/mail/mail.log.1 --problems-first) \
+  || BODY="Error: Mail log not readable or not found: /var/log/mail/mail.log.1\n\nIn case of mail inactivity since the last report, this might be considered a nuisance warning.\n\nYours faithfully, The $HOSTNAME Mailserver"
+
+sendmail -t <<EOF
+From: mailserver-report@$HOSTNAME
+To: $RECIPIENT
+Subject: Postfix Summary for $HOSTNAME
+Content-Transfer-Encoding: 8bit
+Content-Type: text/plain; charset=UTF-8
+
+$BODY
+EOF