From 7106d61f35b5f6dd1b8200a6e8c1cd8a893b76f6 Mon Sep 17 00:00:00 2001
From: Jonas Smedegaard <dr@jones.dk>
Date: Sun, 1 Jan 2017 23:38:59 +0100
Subject: Include fqdn and domain in maildomain cert.

---
 letsencrypt.sh/cron.weekly/local-letsencrypt.sh | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/letsencrypt.sh/cron.weekly/local-letsencrypt.sh b/letsencrypt.sh/cron.weekly/local-letsencrypt.sh
index 8a6bef2..0600730 100755
--- a/letsencrypt.sh/cron.weekly/local-letsencrypt.sh
+++ b/letsencrypt.sh/cron.weekly/local-letsencrypt.sh
@@ -9,6 +9,15 @@ letsencrypt.sh --cron
 
 # update non-EC maildomain cert if resolvable and not clashing with certdomain
 maildomain=$(cat /etc/local-REDPILL/$(cat /etc/local-ORG/realm)/mailhost)
+fqdn=$(hostname --fqdn)
+[ -z "$fqdn" ] \
+	|| [ "$maildomain" = "$fqdn" ] \
+	|| extradomains=${extradomains:+$extradomains }$fqdn
+domain=$(hostname --domain)
+[ -z "$domain" ] \
+	|| [ "$maildomain" = "$domain" ] \
+	|| [ "$fqdn" = "$domain" ] \
+	|| extradomains=${extradomains:+$extradomains }$domain
 [ -z "$maildomain" ] \
 	|| grep ^"$maildomain" /etc/letsencrypt.sh/domains.txt \
-	|| letsencrypt.sh --cron --domain "$maildomain" --algo rsa
+	|| letsencrypt.sh --cron --domain "$maildomain $extradomains" --algo rsa
-- 
cgit v1.2.3