summaryrefslogtreecommitdiffstats
path: root/bin/helpers
diff options
context:
space:
mode:
authorJesse Luehrs <doy@tozt.net>2018-10-25 02:22:31 -0400
committerJesse Luehrs <doy@tozt.net>2018-10-25 02:22:31 -0400
commit3ecf0fa69713f67707628cc87784748c3f930410 (patch)
tree6d8576d52fcaa982099132a46be57b36c9da972b /bin/helpers
parenta1b890f74d7c889a1e26fbfe7f30c61a83445f90 (diff)
downloadpuppet-tozt-3ecf0fa69713f67707628cc87784748c3f930410.tar.gz
puppet-tozt-3ecf0fa69713f67707628cc87784748c3f930410.zip
allow use of subdomains with dkim
Diffstat (limited to 'bin/helpers')
-rwxr-xr-xbin/helpers/launch-mail6
1 files changed, 3 insertions, 3 deletions
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"