base.m4: Nearly set DKIM expiry time.

[exim-config] / config.m4

diff --git a/config.m4 b/config.m4
index 7fba559..8f2db96 100644 (file)
--- a/config.m4
+++ b/config.m4
@@ -75,22 +75,18 @@ DEFCONF(user_extaddr_fixup, ${sg {$local_part_suffix}{^[-+]}{}})
 
 ## Other hosts allowed to relay mail through us.
 DEFCONF(relay_clients, <m4_dnl
-; +trusted m4_dnl
+; +allnets m4_dnl
 ; 172.31.80.8 m4_dnl chiark (VPN)
-; 172.29.198.161 ; 2001:8b0:c92:a000::1:1 m4_dnl national
 )
 
 ## DKIM headers list.
 ## Surprise!  Internal whitespace isn't allowed here.
-DEFCONF(dkim_headers,m4_dnl
-References:In-Reply-To:Subject:To:Date:Message-ID:m4_dnl
-From:Sender:Reply-To:Cc:m4_dnl
-Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:m4_dnl
-Resent-Message-ID:m4_dnl
-Content-Transfer-Encoding:Content-Type:MIME-Version:m4_dnl
-Content-ID:Content-Description:m4_dnl
-List-Id:List-Help:List-Unsubscribe:List-Subscribe:m4_dnl
-List-Post:List-Owner:List-Archive)
+DEFCONF(dkim_headers, m4_dnl
+References : In-Reply-To : Subject : To : Date : Message-ID : m4_dnl
+From : Sender : Reply-To : Cc : m4_dnl
+Content-Transfer-Encoding : Content-Type : MIME-Version : m4_dnl
+Content-ID : Content-Description m4_dnl
+)
 
 ## TLS certificate list.
 DEFCONF(certlist,