From ec159448afd8e89a5a447347e9fc3f342cdd4899 Mon Sep 17 00:00:00 2001
From: usmannasir <usman@cyberpersons.com>
Date: Sat, 27 Sep 2025 11:41:16 +0500
Subject: [PATCH] bug fix: staging site issue

---
 cyberpanel.sh      | 12 +++++++++++-
 install/install.py | 29 +++++++++++++++++++++++++++++
 package-lock.json  |  6 ++++++
 3 files changed, 46 insertions(+), 1 deletion(-)
 create mode 100644 package-lock.json

diff --git a/cyberpanel.sh b/cyberpanel.sh
index 9c2d82ad0..c3c7dc05d 100644
--- a/cyberpanel.sh
+++ b/cyberpanel.sh
@@ -636,7 +636,17 @@ install_cyberpanel_direct() {
     echo "                                    LIVE INSTALLATION PROGRESS"
     echo "==============================================================================================================="
     echo ""
-    
+
+    # Set branch environment variable for the installer
+    if [ -n "$BRANCH_NAME" ]; then
+        export CYBERPANEL_BRANCH="$BRANCH_NAME"
+        echo "Setting installation branch to: $BRANCH_NAME"
+    else
+        export CYBERPANEL_BRANCH="stable"
+        echo "Using default stable branch"
+    fi
+    echo ""
+
     # Run installer and show live output
     if [ "$DEBUG_MODE" = true ]; then
         ./cyberpanel_installer.sh --debug 2>&1 | tee /var/log/CyberPanel/install_output.log
diff --git a/install/install.py b/install/install.py
index 97bab796b..29bb7ed4c 100644
--- a/install/install.py
+++ b/install/install.py
@@ -5201,6 +5201,35 @@ def main():
     # Install core services in the correct order
     checks.installLiteSpeed(ent, serial)
     checks.installMySQL(mysql)
+
+    # Create cyberpanel database and user immediately after MySQL installation
+    logging.InstallLog.writeToFile("Creating cyberpanel database and user...")
+    preFlightsChecks.stdOut("Creating cyberpanel database and user...", 1)
+
+    try:
+        from . import mysqlUtilities
+        from . import install_utils
+
+        # Generate cyberpanel database password using the same logic as download_install_CyberPanel
+        if checks.distro == centos:
+            # On CentOS, generate a separate password for cyberpanel database
+            checks.cyberpanel_db_password = install_utils.generate_pass()
+        else:
+            # On Ubuntu/Debian, the cyberpanel password is the same as root password
+            checks.cyberpanel_db_password = checks.mysql_Root_password
+
+        # Create cyberpanel database and user (restored from v2.4.4 installCyberPanel.py)
+        result = mysqlUtilities.mysqlUtilities.createDatabase("cyberpanel", "cyberpanel", checks.cyberpanel_db_password, "localhost")
+        if result == 1:
+            logging.InstallLog.writeToFile("Cyberpanel database and user created successfully!")
+            preFlightsChecks.stdOut("Cyberpanel database and user created successfully!", 1)
+        else:
+            logging.InstallLog.writeToFile("Warning: Cyberpanel database creation returned error code")
+            preFlightsChecks.stdOut("Warning: Database creation issue", 1)
+    except Exception as e:
+        logging.InstallLog.writeToFile(f"Error creating cyberpanel database: {str(e)}")
+        preFlightsChecks.stdOut(f"Error: Database creation failed: {str(e)}", 1)
+
     checks.installPowerDNS()
     checks.installPureFTPD()
 
diff --git a/package-lock.json b/package-lock.json
new file mode 100644
index 000000000..e0139bf00
--- /dev/null
+++ b/package-lock.json
@@ -0,0 +1,6 @@
+{
+  "name": "cyberpanel",
+  "lockfileVersion": 3,
+  "requires": true,
+  "packages": {}
+}