From 1fb5b4c74bef8f360b52309e02e8bd5e977b960f Mon Sep 17 00:00:00 2001 From: master3395 Date: Sun, 15 Feb 2026 01:44:12 +0100 Subject: [PATCH] docs: MariaDB 11.8 default in README; finish banner: versions + aligned boxes --- README.md | 20 +++++--- cyberpanel_upgrade.sh | 116 ++++++++++++++++++++++-------------------- 2 files changed, 74 insertions(+), 62 deletions(-) diff --git a/README.md b/README.md index dfd97fa11..f1777f50b 100644 --- a/README.md +++ b/README.md @@ -114,24 +114,28 @@ sh <(curl -s https://raw.githubusercontent.com/usmannasir/cyberpanel/stable/preU ## Upgrade to v2.5.5-dev (non-interactive) -Upgrade to v2.5.5-dev without branch or MariaDB prompts: +Upgrade to v2.5.5-dev without branch or MariaDB prompts. + +**MariaDB version options:** `10.11`, `11.8` (LTS default), `12.1` (latest). Use `--mariadb` for 10.11, or `--mariadb-version X` to choose explicitly. If you want to **default to 11.8** and skip the prompt, use `--mariadb-version 11.8`. ```bash -# Upgrade to v2.5.5-dev without prompts +# Upgrade to v2.5.5-dev without prompts (script will prompt for MariaDB unless you pass a flag) sh <(curl -s https://raw.githubusercontent.com/usmannasir/cyberpanel/v2.5.5-dev/preUpgrade.sh || wget -O - https://raw.githubusercontent.com/usmannasir/cyberpanel/v2.5.5-dev/preUpgrade.sh) -b v2.5.5-dev -# With MariaDB 10.11 (non-interactive) +# Default to MariaDB 11.8 (LTS) — recommended, non-interactive +sh <(curl -s https://raw.githubusercontent.com/usmannasir/cyberpanel/v2.5.5-dev/preUpgrade.sh || wget -O - https://raw.githubusercontent.com/usmannasir/cyberpanel/v2.5.5-dev/preUpgrade.sh) -b v2.5.5-dev --mariadb-version 11.8 + +# MariaDB 10.11 (non-interactive) sh <(curl -s https://raw.githubusercontent.com/usmannasir/cyberpanel/v2.5.5-dev/preUpgrade.sh || wget -O - https://raw.githubusercontent.com/usmannasir/cyberpanel/v2.5.5-dev/preUpgrade.sh) -b v2.5.5-dev --mariadb -# Or use --mariadb-version for other versions -sh <(curl -s https://raw.githubusercontent.com/usmannasir/cyberpanel/v2.5.5-dev/preUpgrade.sh || wget -O - https://raw.githubusercontent.com/usmannasir/cyberpanel/v2.5.5-dev/preUpgrade.sh) -b v2.5.5-dev --mariadb-version 10.11 -sh <(curl -s https://raw.githubusercontent.com/usmannasir/cyberpanel/v2.5.5-dev/preUpgrade.sh || wget -O - https://raw.githubusercontent.com/usmannasir/cyberpanel/v2.5.5-dev/preUpgrade.sh) -b v2.5.5-dev --mariadb-version 11.8 +# MariaDB 12.1 (latest) +sh <(curl -s https://raw.githubusercontent.com/usmannasir/cyberpanel/v2.5.5-dev/preUpgrade.sh || wget -O - https://raw.githubusercontent.com/usmannasir/cyberpanel/v2.5.5-dev/preUpgrade.sh) -b v2.5.5-dev --mariadb-version 12.1 ``` -**Full non-interactive command** (v2.5.5-dev + MariaDB 10.11): +**Full non-interactive (v2.5.5-dev + MariaDB 11.8):** ```bash -sh <(curl -s https://raw.githubusercontent.com/usmannasir/cyberpanel/v2.5.5-dev/preUpgrade.sh || wget -O - https://raw.githubusercontent.com/usmannasir/cyberpanel/v2.5.5-dev/preUpgrade.sh) -b v2.5.5-dev --mariadb +sh <(curl -s https://raw.githubusercontent.com/usmannasir/cyberpanel/v2.5.5-dev/preUpgrade.sh || wget -O - https://raw.githubusercontent.com/usmannasir/cyberpanel/v2.5.5-dev/preUpgrade.sh) -b v2.5.5-dev --mariadb-version 11.8 ``` --- diff --git a/cyberpanel_upgrade.sh b/cyberpanel_upgrade.sh index ff77e7b1c..7461989be 100644 --- a/cyberpanel_upgrade.sh +++ b/cyberpanel_upgrade.sh @@ -1673,22 +1673,27 @@ systemctl restart lscpd Post_Install_Display_Final_Info() { echo -e "\n" -echo "╔═══════════════════════════════════════════════════════════════════════════════════════════════════════════════╗" -echo "║ ║" -echo "║ █████████ █████ ███████████ ████ ║" -echo "║ ███▒▒▒▒▒███ ▒▒███ ▒▒███▒▒▒▒▒███ ▒▒███ ║" -echo "║ ███ ▒▒▒ █████ ████ ▒███████ ██████ ████████ ▒███ ▒███ ██████ ████████ ██████ ▒███ ║" -echo "║ ▒███ ▒▒███ ▒███ ▒███▒▒███ ███▒▒███▒▒███▒▒███ ▒██████████ ▒▒▒▒▒███ ▒▒███▒▒███ ███▒▒███ ▒███ ║" -echo "║ ▒███ ▒███ ▒███ ▒███ ▒███▒███████ ▒███ ▒▒▒ ▒███▒▒▒▒▒▒ ███████ ▒███ ▒███ ▒███████ ▒███ ║" -echo "║ ▒▒███ ███ ▒███ ▒███ ▒███ ▒███▒███▒▒▒ ▒███ ▒███ ███▒▒███ ▒███ ▒███ ▒███▒▒▒ ▒███ ║" -echo "║ ▒▒█████████ ▒▒███████ ████████ ▒▒██████ █████ █████ ▒▒████████ ████ █████▒▒██████ █████ ║" -echo "║ ▒▒▒▒▒▒▒▒▒ ▒▒▒▒▒███ ▒▒▒▒▒▒▒▒ ▒▒▒▒▒▒ ▒▒▒▒▒ ▒▒▒▒▒ ▒▒▒▒▒▒▒▒ ▒▒▒▒ ▒▒▒▒▒ ▒▒▒▒▒▒ ▒▒▒▒▒ ║" -echo "║ ███ ▒███ ║" -echo "║ ▒▒██████ ║" -echo "║ ▒▒▒▒▒▒ ║" -echo "║ 🚀 UPGRADE COMPLETED SUCCESSFULLY! 🚀 ║" -echo "║ ║" -echo "╚═══════════════════════════════════════════════════════════════════════════════════════════════════════════════╝" +# Fixed box width (109 chars) so right border (║) aligns in all boxes +BOX_W=109 +_br() { echo "╔═════════════════════════════════════════════════════════════════════════════════════════════════════════════╗"; } +_bl() { echo "╚═════════════════════════════════════════════════════════════════════════════════════════════════════════════╝"; } +_b() { printf '║%-*s║\n' "$BOX_W" "$1"; } +_br +_b "" +_b " █████████ █████ ███████████ ████" +_b " ███▒▒▒▒▒███ ▒▒███ ▒▒███▒▒▒▒▒███ ▒▒███" +_b " ███ ▒▒▒ █████ ████ ▒███████ ██████ ████████ ▒███ ▒███ ██████ ████████ ██████ ▒███" +_b " ▒███ ▒▒███ ▒███ ▒███▒▒███ ███▒▒███▒▒███▒▒███ ▒██████████ ▒▒▒▒▒███ ▒▒███▒▒███ ███▒▒███ ▒███" +_b " ▒███ ▒███ ▒███ ▒███ ▒███▒███████ ▒███ ▒▒▒ ▒███▒▒▒▒▒▒ ███████ ▒███ ▒███ ▒███████ ▒███" +_b " ▒▒███ ███ ▒███ ▒███ ▒███ ▒███▒███▒▒▒ ▒███ ▒███ ███▒▒███ ▒███ ▒███ ▒███▒▒▒ ▒███" +_b " ▒▒█████████ ▒▒███████ ████████ ▒▒██████ █████ █████ ▒▒████████ ████ █████▒▒██████ █████" +_b " ▒▒▒▒▒▒▒▒▒ ▒▒▒▒▒███ ▒▒▒▒▒▒▒▒ ▒▒▒▒▒▒ ▒▒▒▒▒ ▒▒▒▒▒ ▒▒▒▒▒▒▒▒ ▒▒▒▒ ▒▒▒▒▒ ▒▒▒▒▒▒ ▒▒▒▒▒" +_b " ███ ▒███" +_b " ▒▒██████" +_b " ▒▒▒▒▒▒" +_b " 🚀 UPGRADE COMPLETED SUCCESSFULLY! 🚀" +_b "" +_bl Panel_Port=$(cat /usr/local/lscp/conf/bind.conf) if [[ $Panel_Port = "" ]] ; then @@ -1714,48 +1719,51 @@ echo -e "\n🔍 Testing CyberPanel accessibility..." # Check if lscpd service is running if systemctl is-active --quiet lscpd 2>/dev/null; then - echo "╔═════════════════════════════════════════════════════════════════════════════════════════════════════════════╗" - echo "║ ║" - echo "║ 🌐 ACCESS YOUR CYBERPANEL: ║" - echo "║ ║" - echo "║ • Local: https://127.0.0.1:${Panel_Port#*:} ║" - echo "║ • Remote: https://${SERVER_IP}:${Panel_Port#*:} ║" - echo "║ ║" - echo "║ 🔐 Default Login: admin / 1234567890 ║" - echo "║ ⚠️ Please change the default password immediately! ║" - echo "║ ║" -echo "╚═════════════════════════════════════════════════════════════════════════════════════════════════════════════╝" - - # Binary confirmation + _br + _b "" + _b " 🌐 ACCESS YOUR CYBERPANEL:" + _b "" + _b " • Local: https://127.0.0.1:${Panel_Port#*:}" + _b " • Remote: https://${SERVER_IP}:${Panel_Port#*:}" + _b "" + _b " 🔐 Default Login: admin / 1234567890" + _b " ⚠️ Please change the default password immediately!" + _b "" + _bl + + # Binary confirmation + versions echo -e "\n" - echo "╔═════════════════════════════════════════════════════════════════════════════════════════════════════════════╗" - echo "║ ║" - echo "║ 🎯 UPGRADE STATUS: [████████████████████████████████████████████████████████] 100% ║" - echo "║ ║" - echo "║ ✅ All components installed successfully ║" - echo "║ ✅ Python dependencies resolved ║" - echo "║ ✅ WSGI-LSAPI compiled with optimizations ║" - echo "║ ✅ CyberPanel service is running ║" - echo "║ ✅ Web interface is accessible ║" - echo "║ ║" - echo "║ 🎉 UPGRADE COMPLETED SUCCESSFULLY! 🎉 ║" - echo "║ ║" -echo "╚═════════════════════════════════════════════════════════════════════════════════════════════════════════════╝" - + _br + _b "" + _b " 🎯 UPGRADE STATUS: [████████████████████████████████████████████████████████] 100%" + _b "" + _b " ✅ All components installed successfully" + _b " ✅ Python dependencies resolved" + _b " ✅ WSGI-LSAPI compiled with optimizations" + _b " ✅ CyberPanel service is running" + _b " ✅ Web interface is accessible" + _b "" + _b " 📦 CyberPanel: ${Branch_Name:-unknown}" + _b " 📦 Database (MariaDB): ${MARIADB_VER:-unknown}" + _b "" + _b " 🎉 UPGRADE COMPLETED SUCCESSFULLY! 🎉" + _b "" + _bl + else echo -e "❌ CyberPanel may not be running properly. Please check the logs." echo -e "\n" - echo "╔═════════════════════════════════════════════════════════════════════════════════════════════════════════════╗" - echo "║ ║" - echo "║ ⚠️ UPGRADE COMPLETED WITH WARNINGS ║" - echo "║ ║" - echo "║ • CyberPanel files have been updated ║" - echo "║ • Some services may need manual restart ║" - echo "║ • Please check logs at /var/log/cyberpanel_upgrade_debug.log ║" - echo "║ ║" - echo "║ 🔧 Try running: systemctl restart lscpd ║" - echo "║ ║" -echo "╚═════════════════════════════════════════════════════════════════════════════════════════════════════════════╝" + _br + _b "" + _b " ⚠️ UPGRADE COMPLETED WITH WARNINGS" + _b "" + _b " • CyberPanel files have been updated" + _b " • Some services may need manual restart" + _b " • Please check logs at /var/log/cyberpanel_upgrade_debug.log" + _b "" + _b " 🔧 Try running: systemctl restart lscpd" + _b "" + _bl fi echo -e "\n📋 Next Steps:"