Add DKIM, enabled for twosheds

diff --git a/master b/master
index 2c2aa7a258ccd2a415b8d58e2fb58a4d6afa7e5f..9a39ea477608cf0599ff6b5b2b2552437f840b5f 100644 (file)
--- a/master
+++ b/master
@@ -404,6 +404,12 @@ begin transports
 
 remote_smtp:
   driver = smtp
+.ifdef DKIM_SELECTOR
+  dkim_selector = DKIM_SELECTOR
+  dkim_private_key = CONFDIR/$dkim_selector.pem
+  dkim_domain = ${lookup{${lc:${domain:$h_from:}}}wildlsearch{CONFDIR/conf/dkim-domains}{$value}{infradead.org}}
+.endif
+
 
 verp_smtp:
   driver = smtp
@@ -411,6 +417,11 @@ verp_smtp:
   max_rcpt = 1
   headers_remove = Errors-To
   headers_add = Errors-To: ${return_path}
+.ifdef DKIM_SELECTOR
+  dkim_selector = DKIM_SELECTOR
+  dkim_private_key = CONFDIR/$dkim_selector.pem
+  dkim_domain = ${lookup{${lc:${domain:$h_from:}}}wildlsearch{CONFDIR/conf/dkim-domains}{$value}{infradead.org}}
+.endif
 
 procmail:
   driver = pipe

diff --git a/sites/twosheds b/sites/twosheds
index 20a793bfb2b15821d8a87efaf685e9e6966cbce5..d752c148b5a347b62852d76613c4c331c7d1e019 100644 (file)
--- a/sites/twosheds
+++ b/sites/twosheds
@@ -5,6 +5,8 @@ CONFDIR=/etc/exim
 
 CLUSTER=CONFDIR/infradead
 
+DKIM_SELECTOR=twosheds.20170209
+
 domainlist extra_local_domains = 
 
 hostlist relay_hosts = <; ; 90.155.92.192/26 ; 2001:8b0:10b:1::/64 ; \