diff --git a/opendkim.conf b/opendkim.conf index 5be3d36..90fb3ea 100644 --- a/opendkim.conf +++ b/opendkim.conf @@ -18,4 +18,4 @@ PidFile /var/run/opendkim/opendkim.pid SignatureAlgorithm rsa-sha256 UserID opendkim:opendkim -Socket inet:8891@localhost \ No newline at end of file +Socket inet:8891@localhost diff --git a/run.sh b/run.sh index b75bff1..09d0ac7 100644 --- a/run.sh +++ b/run.sh @@ -222,24 +222,15 @@ if [ -d /etc/opendkim/keys ] && [ ! -z "$(find /etc/opendkim/keys -type f ! -nam echo > /etc/opendkim/KeyTable echo > /etc/opendkim/SigningTable - echo "::1" >> /etc/opendkim/TrustedHosts - echo "127.0.0.1" >> /etc/opendkim/TrustedHosts - echo "localhost" >> /etc/opendkim/TrustedHosts - - oldIFS="$IFS" - IFS=','; for i in $MYNETWORKS; do - echo "$i" >> /etc/opendkim/TrustedHosts - done - IFS="$oldIFS" - echo "" >> /etc/opendkim/TrustedHosts + # Since it's an internal service anyways, it's safe + # to assume that *all* hosts are trusted. + echo "0.0.0.0/0" > /etc/opendkim/TrustedHosts if [ ! -z "$ALLOWED_SENDER_DOMAINS" ]; then for i in $ALLOWED_SENDER_DOMAINS; do private_key=/etc/opendkim/keys/$i.private if [ -f $private_key ]; then echo -e " ...for domain ${emphasis}$i${reset}" - echo "*.$i" >> /etc/opendkim/TrustedHosts - echo "$i" >> /etc/opendkim/TrustedHosts echo "mail._domainkey.$i $i:mail:$private_key" >> /etc/opendkim/KeyTable echo "*@$i mail._domainkey.$i" >> /etc/opendkim/SigningTable else