src.hhvn.uk > hhvn.uk-scripts > commit > 2fcee6b97111059f771f3e7e90ce93cae424f00d

commit 2fcee6b97111059f771f3e7e90ce93cae424f00d
parent 6a893c278e344a149c1082fe547572fcbe063a6c
Author: Hayden Hamilton <hayden@hhvn.uk>
Date:   Mon, 25 May 2026 16:47:57 +0100

dkim/reconfig-*: add "ed" prefix to ed25519 key selector

Diffstat:
M
dkim/reconfig-dns
 | 
7
++++---
M
dkim/reconfig-smtpd
 | 
2
+-

2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/dkim/reconfig-dns b/dkim/reconfig-dns
@@ -17,8 +17,6 @@ fn as {
 }
 
 fn record {
-	printf '%s._domainkey\tIN  TXT  "%s" %s\n' \
-		$selector `$nl{cat $1} $telltale
 }
 
 if (test $#* -gt 5 || test $#* -lt 3) {
@@ -38,8 +36,11 @@ as sed -ibkp '/' ^ $telltale ^ '/d' $zonefile
 
 {
 	cat $zonefile
-	record $rsatxt
+	printf '%s._domainkey\tIN  TXT  "%s" %s\n' \
+		$selector `$nl{cat $rsatxt} $telltale
 	record $edtxt
+	printf '%s._domainkey\tIN  TXT  "%s" %s\n' \
+		ed$selector `$nl{cat $edtxt} $telltale
 } | as tee $zonefile >/dev/null
 
 if (!nsd-checkzone $domain $zonefile) {
diff --git a/dkim/reconfig-smtpd b/dkim/reconfig-smtpd
@@ -32,7 +32,7 @@ doas sed -ibkp '/' ^ $telltale ^ '/d' $conf
 	printf 'filter dkimsign_rsa proc-exec "filter-dkimsign -d %s -s %s -k %s" user %s group %s %s\n' \
 		$domain $selector $rsapriv $duser $duser $telltale
 	printf 'filter dkimsign_ed25519 proc-exec "filter-dkimsign -a ed25519-sha256 -d %s -s %s -k %s" user %s group %s %s\n' \
-		$domain $selector $edpriv $duser $duser $telltale
+		$domain ed$selector $edpriv $duser $duser $telltale
 	cat $conf
 } | doas tee $conf >/dev/null