From 1b0101fd285e4a1e8a74f232d03a6da31a94de03 Mon Sep 17 00:00:00 2001
From: Jonas Smedegaard <dr@jones.dk>
Date: Sat, 20 Oct 2018 10:02:14 +0200
Subject: Tidy: Use internal variable mailhost (not maildomain).

---
 dehydrated/cron.weekly/local-dehydrated | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'dehydrated')

diff --git a/dehydrated/cron.weekly/local-dehydrated b/dehydrated/cron.weekly/local-dehydrated
index 2aa495d..24ca7e7 100755
--- a/dehydrated/cron.weekly/local-dehydrated
+++ b/dehydrated/cron.weekly/local-dehydrated
@@ -4,22 +4,22 @@
 
 set -eu
 
-# update non-EC maildomain cert if resolvable and not a certdomain
-maildomain=$(cat /etc/local-REDPILL/$(cat /etc/local-ORG/realm)/mailhost) || true
+# update non-EC mailhost cert if resolvable and not a certdomain
+mailhost=$(cat /etc/local-REDPILL/$(cat /etc/local-ORG/realm)/mailhost) || true
 mailname=$(cat /etc/mailname) || true
 fqdn=$(hostname --fqdn)
 [ -z "$fqdn" ] \
-	|| [ "$maildomain" = "$fqdn" ] \
+	|| [ "$mailhost" = "$fqdn" ] \
 	|| extradomains=${extradomains:+$extradomains }$fqdn
 domain=$(hostname --domain)
 [ -z "$domain" ] \
-	|| [ "$maildomain" = "$domain" ] \
+	|| [ "$mailhost" = "$domain" ] \
 	|| [ "$fqdn" = "$domain" ] \
 	|| extradomains=${extradomains:+$extradomains }$domain
-[ -z "$maildomain" ] \
-	|| [ "$maildomain" != "$mailname" ] \
-	|| grep ^"$maildomain" /etc/dehydrated/domains.txt \
-	|| dehydrated --cron --domain "$maildomain $extradomains" --algo rsa
+[ -z "$mailhost" ] \
+	|| [ "$mailhost" != "$mailname" ] \
+	|| grep ^"$mailhost" /etc/dehydrated/domains.txt \
+	|| dehydrated --cron --domain "$mailhost $extradomains" --algo rsa
 
 # update certdomain certs
 dehydrated --cron "$@"
-- 
cgit v1.2.3