Merge branch 'main' into main_local

2024-10-14 12:45:44 +10:00
parent 715868bda2 d9789d1685
commit f3d8f9fa76
8 changed files with 226 additions and 15 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,11 +8,21 @@
 <h3 align="center">All notable changes to this project will be documented in this file.</h3>

 > [!CAUTION]
-Be cautious of copycat or coat-tailing sites that exploit the project's popularity with potentially malicious intent. Please only trust information from https://Helper-Scripts.com/ or https://tteck.github.io/Proxmox/.
+Exercise vigilance regarding copycat or coat-tailing sites that seek to exploit the project's popularity for potentially malicious purposes. It is imperative to rely solely on information from https://Helper-Scripts.com/ or https://tteck.github.io/Proxmox/ for accurate and trustworthy content.

 > [!NOTE]
 All LXC instances created using this repository come pre-installed with Midnight Commander, which is a command-line tool (`mc`) that offers a user-friendly file and directory management interface for the terminal environment.

+## 2024-10-10
+
+### Changed
+
+- **MySQL LXC** [(View Source)](https://github.com/tteck/Proxmox/blob/main/install/mysql-install.sh)
+  - NEW Script
+- **Tianji LXC** [(Commit)](https://github.com/tteck/Proxmox/commit/4c83a790ac9b040da1f11ad2cbe13d3fc5f480e9)
+  - Breaking Change
+  - Switch from `pm2` process management to `systemd`
+
 ## 2024-10-03

 ### Changed
--- a/ct/mysql.sh
+++ b/ct/mysql.sh
@@ -0,0 +1,70 @@
+#!/usr/bin/env bash
+source <(curl -s https://raw.githubusercontent.com/tteck/Proxmox/main/misc/build.func)
+# Copyright (c) 2021-2024 tteck
+# Author: tteck
+# Co-Author: MickLesk (Canbiz)
+# License: MIT
+# https://github.com/tteck/Proxmox/raw/main/LICENSE
+
+function header_info {
+clear
+cat <<"EOF"
+    __  ___      _____ ____    __ 
+   /  |/  /_  __/ ___// __ \  / / 
+  / /|_/ / / / /\__ \/ / / / / /  
+ / /  / / /_/ /___/ / /_/ / / /___
+/_/  /_/\__, //____/\___\_\/_____/
+       /____/                     
+EOF
+}
+header_info
+echo -e "Loading..."
+APP="MySQL"
+var_disk="4"
+var_cpu="1"
+var_ram="1024"
+var_os="debian"
+var_version="12"
+variables
+color
+catch_errors
+
+function default_settings() {
+  CT_TYPE="1"
+  PW=""
+  CT_ID=$NEXTID
+  HN=$NSAPP
+  DISK_SIZE="$var_disk"
+  CORE_COUNT="$var_cpu"
+  RAM_SIZE="$var_ram"
+  BRG="vmbr0"
+  NET="dhcp"
+  GATE=""
+  APT_CACHER=""
+  APT_CACHER_IP=""
+  DISABLEIP6="no"
+  MTU=""
+  SD=""
+  NS=""
+  MAC=""
+  VLAN=""
+  SSH="no"
+  VERB="no"
+  echo_default
+}
+
+function update_script() {
+header_info
+if [[ ! -f /usr/share/keyrings/mysql.gpg ]]; then msg_error "No ${APP} Installation Found!"; exit; fi
+msg_info "Updating ${APP} LXC"
+apt-get update &>/dev/null
+apt-get -y upgrade &>/dev/null
+msg_ok "Updated Successfully"
+exit
+}
+
+start
+build_container
+description
+
+msg_ok "Completed Successfully!\n"
--- a/ct/tianji.sh
+++ b/ct/tianji.sh
@@ -63,7 +63,7 @@ RELEASE=$(curl -s https://api.github.com/repos/msgbyte/tianji/releases/latest |
 if [[ ! -f /opt/${APP}_version.txt ]] || [[ "${RELEASE}" != "$(cat /opt/${APP}_version.txt)" ]]; then

  msg_info "Stopping ${APP} Service"
-  pm2 stop tianji >/dev/null 2>&1
+  systemctl stop tianji
  msg_ok "Stopped ${APP} Service"

  msg_info "Updating ${APP} to ${RELEASE}"
@@ -75,7 +75,7 @@ if [[ ! -f /opt/${APP}_version.txt ]] || [[ "${RELEASE}" != "$(cat /opt/${APP}_v
  msg_ok "Updated ${APP} to ${RELEASE}"

  msg_info "Starting ${APP}"
-  pm2 start tianji >/dev/null 2>&1
+  systemctl start tianji
  msg_ok "Started ${APP}"
  msg_ok "Updated Successfully"
 else
--- a/install/mariadb-install.sh
+++ b/install/mariadb-install.sh
@@ -27,6 +27,31 @@ sed -i 's/^# *\(port *=.*\)/\1/' /etc/mysql/my.cnf
 sed -i 's/^bind-address/#bind-address/g' /etc/mysql/mariadb.conf.d/50-server.cnf
 msg_ok "Installed MariaDB"

+read -r -p "Would you like to add PhpMyAdmin? <y/N> " prompt
+if [[ ${prompt,,} =~ ^(y|yes)$ ]]; then
+  msg_info "Installing phpMyAdmin"
+  $STD apt-get install -y \
+    apache2 \
+    php \
+    php-mysqli \
+    php-mbstring \
+    php-zip \
+    php-gd \
+    php-json \
+    php-curl 
+	
+	wget -q "https://files.phpmyadmin.net/phpMyAdmin/5.2.1/phpMyAdmin-5.2.1-all-languages.tar.gz"
+	mkdir -p /var/www/html/phpMyAdmin
+	tar xf phpMyAdmin-5.2.1-all-languages.tar.gz --strip-components=1 -C /var/www/html/phpMyAdmin
+	cp /var/www/html/phpMyAdmin/config.sample.inc.php /var/www/html/phpMyAdmin/config.inc.php
+	SECRET=$(openssl rand -base64 24)
+	sed -i "s#\$cfg\['blowfish_secret'\] = '';#\$cfg['blowfish_secret'] = '${SECRET}';#" /var/www/html/phpMyAdmin/config.inc.php
+	chmod 660 /var/www/html/phpMyAdmin/config.inc.php
+	chown -R www-data:www-data /var/www/html/phpMyAdmin
+	systemctl restart apache2
+  msg_ok "Installed phpMyAdmin"
+fi
+
 motd_ssh
 customize

--- a/install/mysql-install.sh
+++ b/install/mysql-install.sh
@@ -0,0 +1,80 @@
+#!/usr/bin/env bash
+
+# Copyright (c) 2021-2024 tteck
+# Author: tteck
+# Co-Author: MickLesk (Canbiz)
+# License: MIT
+# https://github.com/tteck/Proxmox/raw/main/LICENSE
+# Source: https://www.mysql.com/products/community | https://www.phpmyadmin.net
+
+source /dev/stdin <<< "$FUNCTIONS_FILE_PATH"
+color
+verb_ip6
+catch_errors
+setting_up_container
+network_check
+update_os
+
+msg_info "Installing Dependencies"
+$STD apt-get install -y \
+  sudo \
+  lsb-release \
+  curl \
+  gnupg \
+  mc
+msg_ok "Installed Dependencies"
+
+msg_info "Installing MySQL"
+curl -fsSL https://repo.mysql.com/RPM-GPG-KEY-mysql-2023 | gpg --dearmor  -o /usr/share/keyrings/mysql.gpg
+echo "deb [signed-by=/usr/share/keyrings/mysql.gpg] http://repo.mysql.com/apt/debian $(lsb_release -sc) mysql-8.0" >/etc/apt/sources.list.d/mysql.list
+$STD apt-get update
+export DEBIAN_FRONTEND=noninteractive
+$STD apt-get install -y \
+  mysql-community-client \
+  mysql-community-server
+msg_ok "Installed MySQL"
+
+msg_info "Configure MySQL Server"
+ADMIN_PASS="$(openssl rand -base64 18 | cut -c1-13)"
+$STD mysql -uroot -p"$ADMIN_PASS" -e "ALTER USER 'root'@'localhost' IDENTIFIED WITH mysql_native_password BY '$ADMIN_PASS'; FLUSH PRIVILEGES;"
+echo "" >~/mysql.creds
+echo -e "MySQL user: root" >>~/mysql.creds
+echo -e "MySQL password: $ADMIN_PASS" >>~/mysql.creds
+msg_ok "MySQL Server configured"
+
+read -r -p "Would you like to add PhpMyAdmin? <y/N> " prompt
+if [[ ${prompt,,} =~ ^(y|yes)$ ]]; then
+  msg_info "Installing phpMyAdmin"
+  $STD apt-get install -y \
+    apache2 \
+    php \
+    php-mysqli \
+    php-mbstring \
+    php-zip \
+    php-gd \
+    php-json \
+    php-curl 
+	
+	wget -q "https://files.phpmyadmin.net/phpMyAdmin/5.2.1/phpMyAdmin-5.2.1-all-languages.tar.gz"
+	mkdir -p /var/www/html/phpMyAdmin
+	tar xf phpMyAdmin-5.2.1-all-languages.tar.gz --strip-components=1 -C /var/www/html/phpMyAdmin
+	cp /var/www/html/phpMyAdmin/config.sample.inc.php /var/www/html/phpMyAdmin/config.inc.php
+	SECRET=$(openssl rand -base64 24)
+	sed -i "s#\$cfg\['blowfish_secret'\] = '';#\$cfg['blowfish_secret'] = '${SECRET}';#" /var/www/html/phpMyAdmin/config.inc.php
+	chmod 660 /var/www/html/phpMyAdmin/config.inc.php
+	chown -R www-data:www-data /var/www/html/phpMyAdmin
+	systemctl restart apache2
+  msg_ok "Installed phpMyAdmin"
+fi
+
+msg_info "Start Service"
+systemctl enable -q --now mysql
+msg_ok "Service started"
+
+motd_ssh
+customize
+
+msg_info "Cleaning up"
+$STD apt-get -y autoremove
+$STD apt-get -y autoclean
+msg_ok "Cleaned"
--- a/install/pialert-install.sh
+++ b/install/pialert-install.sh
@@ -52,7 +52,9 @@ msg_ok "Installed PHP Dependencies"
 msg_info "Installing Python Dependencies"
 $STD apt-get -y install \
  python3-pip \
-  python3-requests
+  python3-requests \
+  python3-tz \
+  python3-tzlocal
 rm -rf /usr/lib/python3.*/EXTERNALLY-MANAGED
 $STD pip3 install mac-vendor-lookup
 $STD pip3 install fritzconnection
--- a/install/tianji-install.sh
+++ b/install/tianji-install.sh
@@ -18,6 +18,9 @@ update_os
 msg_info "Installing Dependencies"
 $STD apt-get install -y \
  postgresql \
+  python3 \
+  cmake \
+  g++ \
  build-essential \
  curl \
  sudo \
@@ -35,7 +38,7 @@ echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.co
 $STD apt-get update
 $STD apt-get install -y nodejs
 $STD npm install -g pnpm@9.7.1
-$STD npm install -g pm2 
+export NODE_OPTIONS="--max_old_space_size=4096"
 msg_ok "Installed Node.js, pnpm & pm2"

 msg_info "Setting up PostgreSQL"
@@ -62,28 +65,49 @@ wget -q "https://github.com/msgbyte/tianji/archive/refs/tags/v${RELEASE}.zip"
 unzip -q v${RELEASE}.zip
 mv tianji-${RELEASE} /opt/tianji
 cd tianji
-export NODE_OPTIONS=--max_old_space_size=4096
-$STD pnpm install
-$STD pnpm build
+$STD pnpm install --filter @tianji/client... --config.dedupe-peer-dependents=false --frozen-lockfile
+$STD pnpm build:static
+$STD pnpm install --filter @tianji/server... --config.dedupe-peer-dependents=false
+mkdir -p ./src/server/public
+cp -r ./geo ./src/server/public
+$STD pnpm build:server
 echo "${RELEASE}" >"/opt/${APPLICATION}_version.txt"
 cat <<EOF >/opt/tianji/src/server/.env
 DATABASE_URL="postgresql://$DB_USER:$DB_PASS@localhost:5432/$DB_NAME?schema=public"
 JWT_SECRET="$TIANJI_SECRET"
 EOF
-cd /opt/tianji
-$STD npm install pm2 -g
-$STD pm2 install pm2-logrotate
-cd src/server
+cd /opt/tianji/src/server
 $STD pnpm db:migrate:apply
-$STD pm2 start /opt/tianji/src/server/dist/src/server/main.js --name tianji
-$STD pm2 save
 msg_ok "Installed Tianji"

+msg_info "Creating Service"
+cat <<EOF >/etc/systemd/system/tianji.service
+[Unit]
+Description=Tianji Server
+After=network.target
+
+[Service]
+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]
+WantedBy=multi-user.target
+EOF
+systemctl enable -q --now tianji.service
+msg_ok "Created Service"
+
 motd_ssh
 customize

 msg_info "Cleaning up"
 rm -R /opt/v${RELEASE}.zip
+rm -rf /opt/tianji/src/client
+rm -rf /opt/tianji/website
+rm -rf /opt/tianji/reporter
 $STD apt-get -y autoremove
 $STD apt-get -y autoclean
 msg_ok "Cleaned"
--- a/misc/build.func
+++ b/misc/build.func
@@ -491,7 +491,7 @@ install_script() {

 start() {
  if command -v pveversion >/dev/null 2>&1; then
-    if ! (whiptail --backtitle "Proxmox VE Helper Scripts" --title "${APP} LXC" --yesno "To ensure the safety of your system, please only use https://tteck.github.io/Proxmox/\n\nThis will create a New ${APP} LXC. Proceed?" 10 90); then
+    if ! (whiptail --backtitle "Proxmox VE Helper Scripts" --title "${APP} LXC" --yesno "To ensure the safety of your system, please use ONLY https://tteck.github.io/Proxmox/\n\nThis will create a New ${APP} LXC. Proceed?" 10 90); then
      clear
      echo -e "⚠  User exited script \n"
      exit