Better api key support

install.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-### version: 1.5.2
+### version: 1.5.3
 
 # ~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.#
 #    Nightscout Mikr.us setup script    #
@@ -29,12 +29,13 @@ ENV_FILE_ADMIN=/srv/nightscout/config/admin.env
 ENV_FILE_NS=/srv/nightscout/config/nightscout.env
 ENV_FILE_DEP=/srv/nightscout/config/deployment.env
 DOCKER_COMPOSE_FILE=/srv/nightscout/config/docker-compose.yml
+PROFANITY_DB_FILE=/srv/nightscout/data/profanity.db
 MONGO_DB_DIR=/srv/nightscout/data/mongodb
 TOOL_FILE=/srv/nightscout/tools/nightscout-tool
 TOOL_LINK=/usr/bin/nightscout-tool
 UPDATES_DIR=/srv/nightscout/updates
-SCRIPT_VERSION="1.5.2"         #auto-update
+SCRIPT_VERSION="1.5.3"         #auto-update
-SCRIPT_BUILD_TIME="2023.09.11" #auto-update
+SCRIPT_BUILD_TIME="2023.09.13" #auto-update
 
 #=======================================
 # SETUP
@@ -565,6 +566,7 @@ download_conf() {
 	download_if_not_exists "deployment config" $ENV_FILE_DEP https://gitea.dzienia.pl/shared/mikrus-installer/raw/branch/master/templates/deployment.env
 	download_if_not_exists "nightscout config" $ENV_FILE_NS https://gitea.dzienia.pl/shared/mikrus-installer/raw/branch/master/templates/nightscout.env
 	download_if_not_exists "docker compose file" $DOCKER_COMPOSE_FILE https://gitea.dzienia.pl/shared/mikrus-installer/raw/branch/master/templates/docker-compose.yml
+	download_if_not_exists "profanity database" $PROFANITY_DB_FILE https://gitea.dzienia.pl/shared/mikrus-installer/raw/branch/profanity/templates/profanity.db
 }
 
 download_tools() {
@@ -615,6 +617,7 @@ update_if_needed() {
 			curl -fsSL -o "$UPDATES_DIR/deployment.env" "https://gitea.dzienia.pl/shared/mikrus-installer/raw/branch/master/templates/deployment.env"
 			curl -fsSL -o "$UPDATES_DIR/nightscout.env" "https://gitea.dzienia.pl/shared/mikrus-installer/raw/branch/master/templates/nightscout.env"
 			curl -fsSL -o "$UPDATES_DIR/docker-compose.yml" "https://gitea.dzienia.pl/shared/mikrus-installer/raw/branch/master/templates/docker-compose.yml"
+			curl -fsSL -o "$PROFANITY_DB_FILE" "https://gitea.dzienia.pl/shared/mikrus-installer/raw/branch/profanity/templates/profanity.db"
 
 			local changed=0
 			local redeploy=0
@@ -751,6 +754,20 @@ prompt_mikrus_host() {
 prompt_mikrus_apikey() {
 	if ! [[ "$MIKRUS_APIKEY" =~ [0-9a-fA-F]{40} ]]; then
 		freshInstall=$((freshInstall + 1))
+
+		if [ -f "/klucz_api" ]; 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 .server_id)
+
+			if [[ "$MIKRUS_INFO_HOST" == "$MIKRUS_HOST" ]]; then
+				msgcheck "Mikrus OK"
+			else
+				MIKRUS_APIKEY=""
+			fi
+		fi
+
+		if ! [[ "$MIKRUS_APIKEY" =~ [0-9a-fA-F]{40} ]]; then
+
 			whiptail --title "Przygotuj klucz API" --msgbox "Do zarządzania mikrusem [$MIKRUS_HOST] potrzebujemy klucz API.\n\n${uni_bullet}otwórz nową zakładkę w przeglądarce,\n${uni_bullet}wejdź do panelu administracyjnego swojego Mikr.us-a,\n${uni_bullet}otwórz sekcję API, pod adresem:\n\n${uni_bullet_pad}https://mikr.us/panel/?a=api\n\n${uni_bullet}skopiuj do schowka wartość klucza API" 16 70
 			exit_on_no_cancel
 
@@ -773,6 +790,8 @@ prompt_mikrus_apikey() {
 				fi
 			done
 
+		fi
+
 		ohai "Updating admin config (api key)"
 		dotenv-tool -pmr -i $ENV_FILE_ADMIN -- "MIKRUS_APIKEY=$MIKRUS_APIKEY"
 	fi

package.json

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

src/lib.sh

@@ -13,6 +13,7 @@ ENV_FILE_ADMIN=/srv/nightscout/config/admin.env
 ENV_FILE_NS=/srv/nightscout/config/nightscout.env
 ENV_FILE_DEP=/srv/nightscout/config/deployment.env
 DOCKER_COMPOSE_FILE=/srv/nightscout/config/docker-compose.yml
+PROFANITY_DB_FILE=/srv/nightscout/data/profanity.db
 MONGO_DB_DIR=/srv/nightscout/data/mongodb
 TOOL_FILE=/srv/nightscout/tools/nightscout-tool
 TOOL_LINK=/usr/bin/nightscout-tool
@@ -549,6 +550,7 @@ download_conf() {
 	download_if_not_exists "deployment config" $ENV_FILE_DEP https://gitea.dzienia.pl/shared/mikrus-installer/raw/branch/master/templates/deployment.env
 	download_if_not_exists "nightscout config" $ENV_FILE_NS https://gitea.dzienia.pl/shared/mikrus-installer/raw/branch/master/templates/nightscout.env
 	download_if_not_exists "docker compose file" $DOCKER_COMPOSE_FILE https://gitea.dzienia.pl/shared/mikrus-installer/raw/branch/master/templates/docker-compose.yml
+	download_if_not_exists "profanity database" $PROFANITY_DB_FILE https://gitea.dzienia.pl/shared/mikrus-installer/raw/branch/profanity/templates/profanity.db
 }
 
 download_tools() {
@@ -599,6 +601,7 @@ update_if_needed() {
 			curl -fsSL -o "$UPDATES_DIR/deployment.env" "https://gitea.dzienia.pl/shared/mikrus-installer/raw/branch/master/templates/deployment.env"
 			curl -fsSL -o "$UPDATES_DIR/nightscout.env" "https://gitea.dzienia.pl/shared/mikrus-installer/raw/branch/master/templates/nightscout.env"
 			curl -fsSL -o "$UPDATES_DIR/docker-compose.yml" "https://gitea.dzienia.pl/shared/mikrus-installer/raw/branch/master/templates/docker-compose.yml"
+			curl -fsSL -o "$PROFANITY_DB_FILE" "https://gitea.dzienia.pl/shared/mikrus-installer/raw/branch/profanity/templates/profanity.db"
 
 			local changed=0
 			local redeploy=0
@@ -735,6 +738,20 @@ prompt_mikrus_host() {
 prompt_mikrus_apikey() {
 	if ! [[ "$MIKRUS_APIKEY" =~ [0-9a-fA-F]{40} ]]; then
 		freshInstall=$((freshInstall + 1))
+
+		if [ -f "/klucz_api" ]; 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 .server_id)
+
+			if [[ "$MIKRUS_INFO_HOST" == "$MIKRUS_HOST" ]]; then
+				msgcheck "Mikrus OK"
+			else
+				MIKRUS_APIKEY=""
+			fi
+		fi
+
+		if ! [[ "$MIKRUS_APIKEY" =~ [0-9a-fA-F]{40} ]]; then
+
 			whiptail --title "Przygotuj klucz API" --msgbox "Do zarządzania mikrusem [$MIKRUS_HOST] potrzebujemy klucz API.\n\n${uni_bullet}otwórz nową zakładkę w przeglądarce,\n${uni_bullet}wejdź do panelu administracyjnego swojego Mikr.us-a,\n${uni_bullet}otwórz sekcję API, pod adresem:\n\n${uni_bullet_pad}https://mikr.us/panel/?a=api\n\n${uni_bullet}skopiuj do schowka wartość klucza API" 16 70
 			exit_on_no_cancel
 
@@ -757,6 +774,8 @@ prompt_mikrus_apikey() {
 				fi
 			done
 
+		fi
+
 		ohai "Updating admin config (api key)"
 		dotenv-tool -pmr -i $ENV_FILE_ADMIN -- "MIKRUS_APIKEY=$MIKRUS_APIKEY"
 	fi

src/setup.sh

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

templates/profanity.db

@@ -0,0 +1,2 @@
+-test
+-dominik

updated

@@ -1 +1 @@
-2023-09-11T07:09:07.598Z
+2023-09-13T16:31:33.602Z