github-com-docker-mailserver/docker-mailserver
1
0
Fork 0
mirror of https://github.com/docker-mailserver/docker-mailserver.git synced 2024-01-19 02:48:50 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #69 from bilak/master

Browse source 
Fixed crash of opendmarc
This commit is contained in:
Thomas VIAL 2016-01-29 18:55:14 +01:00
parent 7fdcfe3f1b 23ef4ae2ee
commit afffb8d151
3 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
postfix/opendmarc.conf
View file

@ -5,4 +5,4 @@ Syslog true
UMask 0002 UMask 0002
UserID opendmarc:opendmarc UserID opendmarc:opendmarc
IgnoreHosts /etc/opendmarc/ignore.hosts IgnoreHosts /etc/opendmarc/ignore.hosts
HistoryFile /var/run/opendmarc/opendmarc.dat HistoryFile /var/run/opendmarc/opendmarc.dat

4
start-mailserver.sh
View file

@ -100,10 +100,10 @@ chmod -R 0700 /etc/opendkim/keys/
# DMARC # DMARC
# if ther is no AuthservID create it # if ther is no AuthservID create it
if [ `cat /etc/opendmarc.conf | grep -w AuthservID | wc -l` -eq 0 ]; then if [ `cat /etc/opendmarc.conf | grep -w AuthservID | wc -l` -eq 0 ]; then
echo "AuthservID $hostname" >> /etc/opendmarc.conf echo "AuthservID $(hostname)" >> /etc/opendmarc.conf
fi fi
if [ `cat /etc/opendmarc.conf | grep -w TrustedAuthservIDs | wc -l` -eq 0 ]; then if [ `cat /etc/opendmarc.conf | grep -w TrustedAuthservIDs | wc -l` -eq 0 ]; then
echo "TrustedAuthservIDs $hostname" >> /etc/opendmarc.conf echo "TrustedAuthservIDs $(hostname)" >> /etc/opendmarc.conf
fi fi
if [ ! -f "/etc/opendmarc/ignore.hosts" ]; then if [ ! -f "/etc/opendmarc/ignore.hosts" ]; then
mkdir -p /etc/opendmarc/ mkdir -p /etc/opendmarc/

4
test/test.sh
View file

@ -69,5 +69,9 @@ assert_raises "docker exec mail_pop3 grep ': error:' /var/log/mail.log" 1
# Testing OpenDKIM # Testing OpenDKIM
assert "docker exec mail cat /etc/opendkim/KeyTable | wc -l | sed -e 's/^[ \t]*//'" "2" assert "docker exec mail cat /etc/opendkim/KeyTable | wc -l | sed -e 's/^[ \t]*//'" "2"
# Testing OpenDMARC
assert "docker exec mail cat /etc/opendmarc.conf | grep ^AuthservID | wc -l" "1"
assert "docker exec mail cat /etc/opendmarc.conf | grep ^TrustedAuthservID | wc -l" "1"
# Ending tests # Ending tests
assert_end assert_end