From 3232f30d2eb9d54117ea97ceecdd342930f58342 Mon Sep 17 00:00:00 2001 From: Dominik Dzienia Date: Wed, 19 Mar 2025 00:04:13 +0000 Subject: [PATCH] Hotfix release 1.9.4 - made domain detection more robust against old hostnames --- src/lib.sh | 9 ++++++++- src/setup.sh | 2 +- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/lib.sh b/src/lib.sh index ccf67cf..c5d44e7 100644 --- a/src/lib.sh +++ b/src/lib.sh @@ -38,7 +38,7 @@ DISK_LOW_MAIL=5184000 # == 60 days in seconds DISK_CRITICAL_WARNING=104857600 # == 100 MiB DISK_CRITICAL_MAIL=604800 # == 7 days in seconds DOCKER_DOWN_MAIL=604800 # == 7 days in seconds -SCRIPT_VERSION="1.9.3" #auto-update +SCRIPT_VERSION="1.9.4" #auto-update SCRIPT_BUILD_TIME="2024.10.26" #auto-update #======================================= @@ -2305,6 +2305,13 @@ uninstall_menu() { get_td_domain() { local MHOST=$(hostname) + if ! [[ "$MHOST" =~ [a-zA-Z]{2,16}[0-9]{3} ]]; then + MIKRUS_APIKEY=$(cat "/klucz_api") + MIKRUS_INFO_HOST=$(curl -s -d "srv=$MIKRUS_HOST&key=$MIKRUS_APIKEY" -X POST https://api.mikr.us/info | jq -r .imie_id) + if [[ "$MIKRUS_INFO_HOST" =~ [a-zA-Z]{2,16}[0-9]{3} ]]; then + MHOST="$MIKRUS_INFO_HOST" + fi + fi local APIKEY=$(dotenv-tool -r get -f "$ENV_FILE_ADMIN" "MIKRUS_APIKEY") curl -sd "srv=$MHOST&key=$APIKEY" https://api.mikr.us/domain | jq -r ".[].name" | grep ".ns.techdiab.pl" | head -n 1 } diff --git a/src/setup.sh b/src/setup.sh index 72d3f34..023b73d 100755 --- a/src/setup.sh +++ b/src/setup.sh @@ -1,6 +1,6 @@ #!/bin/bash -### version: 1.9.3 +### version: 1.9.4 # ~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.# # Nightscout Mikr.us setup script #