From f2d10c4af65089623da01a0985623cdfd22d6ae3 Mon Sep 17 00:00:00 2001 From: Luke Smith Date: Fri, 1 Jul 2022 19:07:46 -0400 Subject: [PATCH] fix #223 --- emailwiz.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/emailwiz.sh b/emailwiz.sh index 0141219..f9613c7 100755 --- a/emailwiz.sh +++ b/emailwiz.sh @@ -45,13 +45,13 @@ subdom=${MAIL_SUBDOM:-mail} maildomain="$subdom.$domain" certdir="/etc/letsencrypt/live/$maildomain" -[ ! -d "$certdir" ] && certdir="$(dirname "$(certbot certificates 2>/dev/null | grep "$maildomain\|*.$domain" -A 2 | awk '/Certificate Path/ {print $3}' | head -n1)")" +[ ! -d "$certdir" ] && + possiblecert="$(certbot certificates 2>/dev/null | grep "$maildomain\|*\.$domain" -A 2 | awk '/Certificate Path/ {print $3}' | head -n1)" && + certdir="${possiblecert%/*}" [ ! -d "$certdir" ] && echo "Note! You must first have a Let's Encrypt Certbot HTTPS/SSL Certificate for $maildomain. -Use Let's Encrypt's Certbot to get that and then rerun this script. - -You may need to set up a dummy $maildomain site in nginx or Apache for that to work." && exit 1 +Use Let's Encrypt's Certbot to get that and then rerun this script." && exit 1 # NOTE ON POSTCONF COMMANDS