Removed git dependency and pulling latest release (also beta releases) via Download_Install(). Do not exec 'npm run setup' anymore, since the install script uses git to checkout latest repo. We pull the latest release anyway. Use only npm commands for installation. Added hardening to system service. Minimized db-config. Removed unecessary aSTART_SERVICES, added service name to To_Install instead.

Author: JappeHallunken

dietpi/dietpi-software

@@ -1191,7 +1191,7 @@ Available commands:
 		aSOFTWARE_DESC[$software_id]='A fancy self-hosted monitoring tool'
 		aSOFTWARE_CATX[$software_id]=8
 		aSOFTWARE_DOCS[$software_id]='https://dietpi.com/docs/software/system_stats/#uptime_kuma'
-		aSOFTWARE_DEPS[$software_id]='17 9' # Git, Node.js
+		aSOFTWARE_DEPS[$software_id]='9' # Node.js
 
 		# Remote Access
 		#--------------------------------------------------------------------------------
@@ -12289,41 +12289,39 @@ _EOF_
 			unset -v rd_inst rd_data
 		fi
 
-        if To_Install 176 # Uptime Kuma
+        if To_Install 176 uptime-kuma # Uptime Kuma
         then
           local opt='/opt/uptime-kuma'
           local mnt='/mnt/dietpi_userdata/uptime-kuma'
+          local LATEST_TAG=$(curl -s https://api.github.com/repos/louislam/uptime-kuma/tags | grep -Po '"name": "\K.*?(?=")' | head -n1)
 
           # Reinstall
           [[ -d $opt ]] && G_EXEC rm -R "$opt"
 
           # User and directories
           Create_User -d "$mnt" uptime-kuma
 
+          G_EXEC mkdir -p "$opt" "$mnt"
+
           # Clone & install https://github.com/louislam/uptime-kuma/wiki/%F0%9F%94%A7-How-to-Install#-non-docker
-          G_EXEC git clone https://github.com/louislam/uptime-kuma.git "$opt"
-          G_EXEC cd "$opt" && /usr/local/bin/npm run setup
+          Download_Install "https://github.com/louislam/uptime-kuma/archive/refs/tags/${LATEST_TAG}.tar.gz" /opt
 
-          # Create data dir and link it
-          G_EXEC mkdir -p "$mnt"
+          G_EXEC rsync -a "/opt/uptime-kuma-$LATEST_TAG/" "$opt/"
+          G_EXEC rm -R "/opt/uptime-kuma-$LATEST_TAG"
           G_EXEC ln -s "$mnt" "$opt/data"
 
+          G_EXEC cd "$opt"
+          G_EXEC_OUTPUT=1 G_EXEC npm ci --omit dev --no-audit
+          G_EXEC_OUTPUT=1 G_EXEC npm run download-dist
+
           # Create db-config to pre-select usage of sqlite3 (without this you can choose between mariaDB and sqlite on first run)
-          [[ -f "$mnt/db-config.json" ]] || cat << _EOF_ > "$mnt/db-config.json" || exit 1
-{
-    "type": "sqlite",
-    "port": 3306,
-    "hostname": "",
-    "username": "",
-    "password": "",
-    "dbName": "kuma"
-}
-_EOF_
-         G_EXEC chown -R uptime-kuma:uptime-kuma "$mnt"
-         G_EXEC chmod -R 755 "$mnt"
+          [[ -f "$mnt/db-config.json" ]] || G_EXEC eval "echo '{\"type\":\"sqlite\"}' > '$mnt/db-config.json'"
 
-         # Create systemd service, we do not use pm2 to run it
-         cat << _EOF_ > /etc/systemd/system/uptime-kuma.service
+          G_EXEC chown -R uptime-kuma:uptime-kuma "$mnt"
+          G_EXEC chmod -R 755 "$mnt"
+
+          # Create systemd service, we do not use pm2 to run it
+          cat << _EOF_ > /etc/systemd/system/uptime-kuma.service
 # /etc/systemd/system/uptime-kuma.service
 [Unit]
 Description=Uptime Kuma
@@ -12339,11 +12337,23 @@ Restart=on-failure
 RestartSec=10
 Environment=NODE_ENV=production
 
+# Hardening
+ProtectSystem=strict
+ProtectHome=1
+PrivateUsers=1
+PrivateTmp=1
+PrivateDevices=1
+ProtectKernelTunables=1
+ProtectControlGroups=1
+ProtectKernelModules=1
+ProtectKernelLogs=1
+ProtectClock=1
+ReadWritePaths=-$mnt
+
 [Install]
 WantedBy=multi-user.target
 _EOF_
-          aSTART_SERVICES+=('uptime-kuma')
-          unset -v mnt opt
+          unset -v mnt opt LATEST_TAG
         fi
 	}
 
@@ -14490,7 +14500,6 @@ _EOF_
         then
           Remove_Service uptime-kuma uptime-kuma uptime-kuma
           G_EXEC rm -Rf /opt/uptime-kuma
-          G_EXEC rm -Rf /mnt/dietpi_userdata/uptime-kuma
         fi
 
 		G_DIETPI-NOTIFY 3 "$G_PROGRAM_NAME" 'Finalising uninstall'