From 18b1c0e72275e8c34b85c5f23c0e70404210d6a9 Mon Sep 17 00:00:00 2001
From: "Hahn Axel (hahn)" <axel.hahn@unibe.ch>
Date: Thu, 9 Jan 2025 12:08:19 +0100
Subject: [PATCH 1/2] fix handling for issue with dns alias
---
cm.sh | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/cm.sh b/cm.sh
index d1d4597..c8e7fbf 100755
--- a/cm.sh
+++ b/cm.sh
@@ -38,6 +38,7 @@
# 2023-05-08 <axel.hahn@unibe.ch> fix: "key and cert do not match"
# 2024-03-21 <axel.hahn@unibe.ch> shorter sleep times
# 2025-01-08 <axel.hahn@unibe.ch> support for http challenge on port 80; more params supported for force renew, http challenge
+# 2025-01-09 <axel.hahn@unibe.ch> fix handling for issue with dns alias
# ======================================================================
@@ -47,7 +48,7 @@
#
# ----------------------------------------------------------------------
-_version="2025-01-08"
+_version="2025-01-09"
logdir="./log"
touchfile="$logdir/lastchange.txt"
@@ -246,7 +247,7 @@ function _dnsCheck(){
_wd "dig check - domain for cert"
_checkDig "$_mydomain" "a" "IN.*(A|CNAME)" # matches A and CNAME records
- if [ -n "${CM_challenge_alias}" ] && ! echo "$_mydomain" | grep "${CM_certmatch}" >/dev/null
+ if [ -n "${CM_challenge_alias}" ] && ! echo "$_mydomain" | grep "${CM_challenge_alias}" >/dev/null
then
_wd "dig check - cname ${_subdomain}.${_mydomain} must exist"
_checkDig "${_subdomain}.${_mydomain}" "cname"
@@ -603,12 +604,13 @@ function public_add(){
else
if [ -n "${CM_challenge_alias}" ]
then
- echo "INFO: Using DNS for challenge"
_params+=" --challenge-alias "
- if ! echo "$_mydomain" | grep "${CM_certmatch}" >/dev/null
+ if ! echo "$_mydomain" | grep "${CM_challenge_alias}" >/dev/null
then
+ echo "INFO: Using DNS for challenge with dns-alias to ${CM_challenge_alias} for $_mydomain"
_params+="${CM_challenge_alias} "
else
+ echo "INFO: Using DNS for challenge for $_mydomain"
_params+="no "
fi
fi
--
GitLab
From 671ec11a229a37e7bbfa32ec89f51beccc420017 Mon Sep 17 00:00:00 2001
From: "Hahn Axel (hahn)" <axel.hahn@unibe.ch>
Date: Thu, 9 Jan 2025 12:08:32 +0100
Subject: [PATCH 2/2] update docs
---
docs/30_Usage.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/docs/30_Usage.md b/docs/30_Usage.md
index e111535..f10d389 100644
--- a/docs/30_Usage.md
+++ b/docs/30_Usage.md
@@ -14,7 +14,7 @@ Without -h or --help it shows a help.
_______________________________________________________________________________
- - - - ---===>>> CERT MANAGER - v2025-01-08 <<<===--- - - -
+ - - - ---===>>> CERT MANAGER - v2025-01-09 <<<===--- - - -
_______________________________________________________________________________
--
GitLab