From 3ecf0fa69713f67707628cc87784748c3f930410 Mon Sep 17 00:00:00 2001
From: Jesse Luehrs <doy@tozt.net>
Date: Thu, 25 Oct 2018 02:22:31 -0400
Subject: allow use of subdomains with dkim

---
 bin/helpers/launch-mail | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'bin/helpers')

diff --git a/bin/helpers/launch-mail b/bin/helpers/launch-mail
index 922656a..4e28bae 100755
--- a/bin/helpers/launch-mail
+++ b/bin/helpers/launch-mail
@@ -78,14 +78,14 @@ remote "cd '$conf_location' && puppet apply --modulepath=./mail -e 'include mail
 echo "Done provisioning"
 
 echo "Creating DKIM entry"
-dkim=$(remote "perl -pe'chomp; s/.*\"(.*)\".*/\$1/' /mailu/dkim/tozt.net.dkim.pub")
+dkim=$(remote "perl -pe'chomp; s/.*\"(.*)\".*/\$1/' /mailu/dkim/new2.tozt.net.dkim.pub")
 dkim_record_id=$(doctl \
     -t "$(cat /mnt/digitalocean)" \
     compute domain records list \
     tozt.net \
     --format Name,Type,ID \
     --no-header \
-    | grep '^dkim._domainkey \+TXT ' \
+    | grep '^dkim._domainkey.new2 \+TXT ' \
     | awk '{print $3}'
 )
 doctl \
@@ -94,7 +94,7 @@ doctl \
     tozt.net \
     --record-id "$dkim_record_id" \
     --record-type TXT \
-    --record-name dkim._domainkey \
+    --record-name dkim._domainkey.new2 \
     --record-data "$dkim" \
     --record-ttl 60
 echo "Done creating DKIM entry"
-- 
cgit v1.2.3-54-g00ecf