From 4134136918f5ece94a470ca8715000c2ebf38087 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Slavi=C5=A1a=20Are=C5=BEina?=
 <58952836+tremor021@users.noreply.github.com>
Date: Wed, 10 Dec 2025 18:38:56 +0100
Subject: [PATCH] Refactor (#9842)

---
 ct/tianji.sh                     |  1 -
 frontend/public/json/tianji.json |  2 +-
 install/tianji-install.sh        | 30 ++++--------------------------
 3 files changed, 5 insertions(+), 28 deletions(-)

diff --git a/ct/tianji.sh b/ct/tianji.sh
index 86e0c0961..23e0a09f7 100644
--- a/ct/tianji.sh
+++ b/ct/tianji.sh
@@ -28,7 +28,6 @@ function update_script() {
   fi
 
   setup_uv
-
   if check_for_gh_release "tianji" "msgbyte/tianji"; then
     NODE_VERSION="22" NODE_MODULE="pnpm@$(curl -s https://raw.githubusercontent.com/msgbyte/tianji/master/package.json | jq -r '.packageManager | split("@")[1]')" setup_nodejs
 
diff --git a/frontend/public/json/tianji.json b/frontend/public/json/tianji.json
index 50abc96bf..3fcca7705 100644
--- a/frontend/public/json/tianji.json
+++ b/frontend/public/json/tianji.json
@@ -11,7 +11,7 @@
   "interface_port": 12345,
   "documentation": "https://tianji.dev/docs/intro",
   "website": "https://tianji.msgbyte.com/",
-  "logo": "https://cdn.jsdelivr.net/gh/selfhst/icons@master/webp/tianji.webp",
+  "logo": "https://cdn.jsdelivr.net/gh/selfhst/icons@main/webp/tianji.webp",
   "config_path": "/opt/tianji/src/server/.env",
   "description": "Tianji is an open-source tool for website analytics, uptime monitoring, and server status tracking, all in one. It\u2019s lightweight, privacy-focused, and helps teams monitor web traffic, server health, and gather user interaction data",
   "install_methods": [
diff --git a/install/tianji-install.sh b/install/tianji-install.sh
index 38b0f4f94..62dede13e 100644
--- a/install/tianji-install.sh
+++ b/install/tianji-install.sh
@@ -18,38 +18,17 @@ msg_info "Installing Dependencies"
 $STD apt install -y \
   python3 \
   cmake \
-  g++ \
   build-essential \
-  git \
-  ca-certificates
+  git
 msg_ok "Installed Dependencies"
 
 NODE_VERSION="22" NODE_MODULE="pnpm@$(curl -s https://raw.githubusercontent.com/msgbyte/tianji/master/package.json | jq -r '.packageManager | split("@")[1]')" setup_nodejs
 PG_VERSION="17" setup_postgresql
+PG_DB_NAME="tianji_db" PG_DB_USER="tianji" setup_postgresql_db
 PYTHON_VERSION="3.13" setup_uv
-
-msg_info "Setting up PostgreSQL"
-DB_NAME=tianji_db
-DB_USER=tianji
-DB_PASS="$(openssl rand -base64 18 | cut -c1-13)"
-TIANJI_SECRET="$(openssl rand -base64 32 | cut -c1-24)"
-$STD sudo -u postgres psql -c "CREATE DATABASE $DB_NAME;"
-$STD sudo -u postgres psql -c "CREATE USER $DB_USER WITH PASSWORD '$DB_PASS';"
-$STD sudo -u postgres psql -c "GRANT ALL PRIVILEGES ON DATABASE $DB_NAME TO $DB_USER;"
-$STD sudo -u postgres psql -c "ALTER DATABASE $DB_NAME OWNER TO $DB_USER;"
-$STD sudo -u postgres psql -c "ALTER USER $DB_USER WITH SUPERUSER;"
-{
-  echo ""
-  echo "Database User: $DB_USER"
-  echo "Database Password: $DB_PASS"
-  echo "Database Name: $DB_NAME"
-  echo "Tianji Secret: $TIANJI_SECRET"
-} >>~/tianji.creds
-msg_ok "Set up PostgreSQL"
-
 fetch_and_deploy_gh_release "tianji" "msgbyte/tianji"
 
-msg_info "Setup Tianji"
+msg_info "Setting up Tianji"
 cd /opt/tianji
 $STD pnpm install --filter @tianji/client... --config.dedupe-peer-dependents=false --frozen-lockfile
 $STD pnpm build:static
@@ -69,7 +48,7 @@ rm -rf /opt/tianji/website
 rm -rf /opt/tianji/reporter
 msg_ok "Setup Tianji"
 
-msg_info "Setup AppRise"
+msg_info "Setting up AppRise"
 $STD uv pip install apprise cryptography --system
 msg_ok "Setup AppRise"
 
@@ -84,7 +63,6 @@ ExecStart=/usr/bin/node /opt/tianji/src/server/dist/src/server/main.js
 WorkingDirectory=/opt/tianji/src/server
 Restart=always
 RestartSec=10
-
 Environment=NODE_ENV=production
 
 [Install]