From f943e5c96169357ec591b5a36bfb9bcb1d305944 Mon Sep 17 00:00:00 2001
From: usmannasir <usman@cyberpersons.com>
Date: Sun, 21 Sep 2025 00:37:02 +0500
Subject: [PATCH] some bug fixes to install.py

---
 install/install.py | 47 +++++++++++++++-------------------------------
 1 file changed, 15 insertions(+), 32 deletions(-)

diff --git a/install/install.py b/install/install.py
index c8a1f4efa..673f2c4a7 100644
--- a/install/install.py
+++ b/install/install.py
@@ -690,7 +690,21 @@ password="%s"
 
         # self.setupVirtualEnv(self.distro)
 
-        ### Database migrations will be handled after database creation
+        # Now run Django migrations since we're in /usr/local/CyberCP and database exists
+        os.chdir("/usr/local/CyberCP")
+        logging.InstallLog.writeToFile("Running Django migrations...")
+        preFlightsChecks.stdOut("Running Django migrations...")
+
+        # Create fresh migrations for all apps
+        command = "/usr/local/CyberPanel-venv/bin/python manage.py makemigrations"
+        preFlightsChecks.call(command, self.distro, command, command, 1, 1, os.EX_OSERR)
+
+        # Apply all migrations
+        command = "/usr/local/CyberPanel-venv/bin/python manage.py migrate"
+        preFlightsChecks.call(command, self.distro, command, command, 1, 1, os.EX_OSERR)
+
+        logging.InstallLog.writeToFile("Django migrations completed successfully!")
+        preFlightsChecks.stdOut("Django migrations completed successfully!")
 
         if not os.path.exists("/usr/local/CyberCP/public"):
             os.mkdir("/usr/local/CyberCP/public")
@@ -2917,37 +2931,6 @@ def main():
         installCyberPanel.Main(cwd, mysql, distro, ent, serial, port, args.ftp, args.powerdns, args.publicip,
                                remotemysql, mysqlhost, mysqldb, mysqluser, mysqlpassword, mysqlport)
 
-    # Now that database is created, run Django migrations
-    preFlightsChecks.stdOut("Running Django migrations...")
-    # The application should be at /usr/local/CyberCP after download_install_CyberPanel
-    if os.path.exists("/usr/local/CyberCP"):
-        os.chdir("/usr/local/CyberCP")
-        preFlightsChecks.stdOut("Changed to /usr/local/CyberCP directory for migrations")
-    else:
-        # Check if it's still in cyberpanel (move may have failed)
-        if os.path.exists("/usr/local/cyberpanel"):
-            preFlightsChecks.stdOut("WARNING: Application is in /usr/local/cyberpanel instead of /usr/local/CyberCP")
-            preFlightsChecks.stdOut("Attempting to fix directory structure...")
-
-            # Try to move it now
-            os.chdir("/usr/local")
-            if os.path.exists("CyberCP"):
-                shutil.rmtree("CyberCP")
-            shutil.move("cyberpanel", "CyberCP")
-            os.chdir("/usr/local/CyberCP")
-            preFlightsChecks.stdOut("Fixed: Moved cyberpanel to CyberCP")
-        else:
-            preFlightsChecks.stdOut("ERROR: Neither /usr/local/CyberCP nor /usr/local/cyberpanel exists!")
-            sys.exit(1)
-
-    # Create fresh migrations for all apps
-    command = "/usr/local/CyberPanel-venv/bin/python manage.py makemigrations"
-    preFlightsChecks.call(command, distro, command, command, 1, 1, os.EX_OSERR)
-
-    # Apply all migrations
-    command = "/usr/local/CyberPanel-venv/bin/python manage.py migrate"
-    preFlightsChecks.call(command, distro, command, command, 1, 1, os.EX_OSERR)
-
     checks.setupPHPAndComposer()
     checks.fix_selinux_issue()
     checks.install_psmisc()