Fixed internalhosts

entrypoint.sh

@@ -18,8 +18,7 @@
 # DNS / trust defaults.
 : "${OPENDKIM_TRUSTANCHORFILE:=}"
 : "${OPENDKIM_INTERNALHOSTS:=127.0.0.1,localhost,127.0.0.0/8,192.168.0.0/16,172.16.0.0/12,10.0.0.0/8}"
-: "${OPENDKIM_EXTERNALIGNORELIST:=refile:/etc/opendkim/TrustedHosts}"
-: "${OPENDKIM_INTERNALHOSTS_FILE:=/etc/opendkim/TrustedHosts}"
+: "${OPENDKIM_EXTERNALIGNORELIST:=}"
 
 # Table files.
 : "${OPENDKIM_KEYTABLE:=/etc/opendkim/KeyTable}"
@@ -98,8 +97,7 @@ Socket                  ${OPENDKIM_SOCKET}
 PidFile                 ${OPENDKIM_PIDFILE}
 KeyTable                ${OPENDKIM_KEYTABLE}
 SigningTable            ${OPENDKIM_SIGNINGTABLE}
-ExternalIgnoreList      ${OPENDKIM_EXTERNALIGNORELIST}
-InternalHosts           refile:${OPENDKIM_INTERNALHOSTS_FILE}
+InternalHosts           ${OPENDKIM_INTERNALHOSTS}
 AutoRestart             ${OPENDKIM_AUTO_RESTART}
 AutoRestartRate         ${OPENDKIM_AUTO_RESTART_RATE}
 DNSTimeout              ${OPENDKIM_DNS_TIMEOUT}
@@ -113,6 +111,10 @@ if [ -n "${OPENDKIM_TRUSTANCHORFILE}" ] && [ -f "${OPENDKIM_TRUSTANCHORFILE}" ];
   echo "TrustAnchorFile         ${OPENDKIM_TRUSTANCHORFILE}" >> /etc/opendkim.conf
 fi
 
+if [ -n "${OPENDKIM_EXTERNALIGNORELIST}" ] && [ -f "${OPENDKIM_EXTERNALIGNORELIST}" ]; then
+  echo "ExternalIgnoreList      ${OPENDKIM_EXTERNALIGNORELIST}" >> /etc/opendkim.conf
+fi
+
 if [ "${OPENDKIM_LOGRESULTS}" = "yes" ]; then
   echo "SoftwareHeader          yes" >> /etc/opendkim.conf
 fi