CHANGELOG.md

@@ -5,6 +5,16 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [1.9.2] - 2025-03-13
+
+### Changed
+
+- Adjusted to new mikr.us host naming strategy
+
+### Fixed
+
+- Limited of watchdog logs added for diagnostics
+
 ## [1.9.1] - 2024-10-26
 
 ### Added

install.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-### version: 1.9.1
+### version: 1.9.2
 
 # ~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.#
 #    Nightscout Mikr.us setup script    #
@@ -54,8 +54,8 @@ 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.1"          #auto-update
-SCRIPT_BUILD_TIME="2024.10.26"  #auto-update
+SCRIPT_VERSION="1.9.2"          #auto-update
+SCRIPT_BUILD_TIME="2025.03.13"  #auto-update
 
 #=======================================
 # SETUP
@@ -939,12 +939,14 @@ setup_firewall() {
 		ufw allow ssh
 	} >>"$LOGTO" 2>&1
 
-	host=$(hostname)
-	host=${host:1}
-
-	port1=$((10000 + host))
-	port2=$((20000 + host))
-	port3=$((30000 + host))
+  host=$(hostname)
+  
+  # Extract the last 3 digits from the hostname
+  port_number=$(echo "$host" | grep -oE '[0-9]{3}$')
+	
+  port1=$((10000 + port_number))
+  port2=$((20000 + port_number))
+  port3=$((30000 + port_number))
 
 	if ufw allow "$port1" >>"$LOGTO" 2>&1; then
 		msgcheck "Do regul firewalla poprawnie dodano port $port1"
@@ -1334,15 +1336,15 @@ instal_now_prompt() {
 }
 
 prompt_mikrus_host() {
-	if ! [[ "$MIKRUS_HOST" =~ [a-z][0-9]{3} ]]; then
+	if ! [[ "$MIKRUS_HOST" =~ [a-zA-Z]{1,16}[0-9]{3} ]]; then
 		MIKRUS_HOST=$(hostname)
 		while :; do
-			if [[ "$MIKRUS_HOST" =~ [a-z][0-9]{3} ]]; then
+			if [[ "$MIKRUS_HOST" =~ [a-zA-Z]{1,16}[0-9]{3} ]]; then
 				break
 			else
 				MIKRUS_NEW_HOST=$(whiptail --title "Podaj identyfikator serwera" --inputbox "\nNie udało się wykryć identyfikatora serwera,\npodaj go poniżej ręcznie.\n\nIdentyfikator składa się z jednej litery i trzech cyfr\n" --cancel-button "Anuluj" 13 65 3>&1 1>&2 2>&3)
 				exit_on_no_cancel
-				if [[ "$MIKRUS_NEW_HOST" =~ [a-z][0-9]{3} ]]; then
+				if [[ "$MIKRUS_NEW_HOST" =~ [a-zA-Z]{1,16}[0-9]{3} ]]; then
 					MIKRUS_HOST=$MIKRUS_NEW_HOST
 					break
 				else
@@ -2401,7 +2403,7 @@ gather_diagnostics() {
 			echo "$LOG_DIVIDER"
 			echo " Watchdog log"
 			echo "$LOG_DIVIDER"
-			timeout -k 15 10 cat "$WATCHDOG_LOG_FILE"
+			timeout -k 15 10 tail -n 200 "$WATCHDOG_LOG_FILE"
 		} >>"$SUPPORT_LOG"
 	fi
 
@@ -2410,7 +2412,7 @@ gather_diagnostics() {
 			echo "$LOG_DIVIDER"
 			echo " Watchdog failures log"
 			echo "$LOG_DIVIDER"
-			timeout -k 15 10 cat "$WATCHDOG_FAILURES_FILE"
+			timeout -k 15 10 tail -n 200 "$WATCHDOG_FAILURES_FILE"
 		} >>"$SUPPORT_LOG"
 	fi
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dlvoy/ns-installer-mikrus",
-  "version": "1.9.1",
+  "version": "1.9.2",
   "description": "Nightscout installer for mikr.us VPS",
   "main": "index.js",
   "scripts": {

src/lib.sh

@@ -923,12 +923,14 @@ setup_firewall() {
 		ufw allow ssh
 	} >>"$LOGTO" 2>&1
 
-	host=$(hostname)
-	host=${host:1}
-
-	port1=$((10000 + host))
-	port2=$((20000 + host))
-	port3=$((30000 + host))
+  host=$(hostname)
+  
+  # Extract the last 3 digits from the hostname
+  port_number=$(echo "$host" | grep -oE '[0-9]{3}$')
+	
+  port1=$((10000 + port_number))
+  port2=$((20000 + port_number))
+  port3=$((30000 + port_number))
 
 	if ufw allow "$port1" >>"$LOGTO" 2>&1; then
 		msgcheck "Do regul firewalla poprawnie dodano port $port1"
@@ -1318,15 +1320,15 @@ instal_now_prompt() {
 }
 
 prompt_mikrus_host() {
-	if ! [[ "$MIKRUS_HOST" =~ [a-z][0-9]{3} ]]; then
+	if ! [[ "$MIKRUS_HOST" =~ [a-zA-Z]{1,16}[0-9]{3} ]]; then
 		MIKRUS_HOST=$(hostname)
 		while :; do
-			if [[ "$MIKRUS_HOST" =~ [a-z][0-9]{3} ]]; then
+			if [[ "$MIKRUS_HOST" =~ [a-zA-Z]{1,16}[0-9]{3} ]]; then
 				break
 			else
 				MIKRUS_NEW_HOST=$(whiptail --title "Podaj identyfikator serwera" --inputbox "\nNie udało się wykryć identyfikatora serwera,\npodaj go poniżej ręcznie.\n\nIdentyfikator składa się z jednej litery i trzech cyfr\n" --cancel-button "Anuluj" 13 65 3>&1 1>&2 2>&3)
 				exit_on_no_cancel
-				if [[ "$MIKRUS_NEW_HOST" =~ [a-z][0-9]{3} ]]; then
+				if [[ "$MIKRUS_NEW_HOST" =~ [a-zA-Z]{1,16}[0-9]{3} ]]; then
 					MIKRUS_HOST=$MIKRUS_NEW_HOST
 					break
 				else
@@ -2385,7 +2387,7 @@ gather_diagnostics() {
 			echo "$LOG_DIVIDER"
 			echo " Watchdog log"
 			echo "$LOG_DIVIDER"
-			timeout -k 15 10 cat "$WATCHDOG_LOG_FILE"
+			timeout -k 15 10 tail -n 200 "$WATCHDOG_LOG_FILE"
 		} >>"$SUPPORT_LOG"
 	fi
 
@@ -2394,7 +2396,7 @@ gather_diagnostics() {
 			echo "$LOG_DIVIDER"
 			echo " Watchdog failures log"
 			echo "$LOG_DIVIDER"
-			timeout -k 15 10 cat "$WATCHDOG_FAILURES_FILE"
+			timeout -k 15 10 tail -n 200 "$WATCHDOG_FAILURES_FILE"
 		} >>"$SUPPORT_LOG"
 	fi
 

src/setup.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-### version: 1.9.1
+### version: 1.9.2
 
 # ~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.#
 #    Nightscout Mikr.us setup script    #

updated

@@ -1 +1 @@
-2024-10-26T08:38:49.153Z
+2025-03-13T13:20:10.412Z