diff options
| -rwxr-xr-x | dkim/reconfig-dns | 7 | ||||
| -rwxr-xr-x | dkim/reconfig-smtpd | 2 |
2 files changed, 5 insertions, 4 deletions
diff --git a/dkim/reconfig-dns b/dkim/reconfig-dns index 6fa0f6d..f81862a 100755 --- 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 index a9a302d..87b543a 100755 --- 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 |