Nemcio/CyberPanel
1
0
Fork 0
mirror of https://github.com/usmannasir/cyberpanel.git synced 2026-01-08 16:42:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'usmannasir:v2.5.5-dev' into v2.5.5-dev

Browse Source
This commit is contained in:
Master3395
2025-09-18 20:46:36 +02:00
committed by GitHub
parent 9c9d0f3075 2f297029d0
commit 661a7e9797
1 changed files with 29 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
install/install.py
View File

@@ -445,10 +445,11 @@ class preFlightsChecks:
### Docker User/group
if self.distro == ubuntu:
if self.distro == ubuntu or self.distro == debian12:
command = 'adduser --disabled-login --gecos "" docker'
else:
command = "adduser docker"
# For CentOS/RHEL, use useradd which is non-interactive
command = "useradd -r -s /bin/false docker"
preFlightsChecks.call(command, self.distro, command, command, 1, 0, os.EX_OSERR)
@@ -660,13 +661,36 @@ password="%s"
os.chdir("/usr/local/CyberCP")
# Try makemigrations first
command = "/usr/local/CyberPanel/bin/python manage.py makemigrations"
preFlightsChecks.call(command, self.distro, command, command, 1, 1, os.EX_OSERR)
result = preFlightsChecks.call(command, self.distro, command, command, 1, 0, os.EX_OSERR)
# If makemigrations fails due to migration dependency issues, try to fix it
if result != 1:
preFlightsChecks.stdOut("Migration dependency issue detected, attempting to fix...")
# Reset baseTemplate migrations to resolve dependency issues
command = "/usr/local/CyberPanel/bin/python manage.py migrate baseTemplate zero --fake"
preFlightsChecks.call(command, self.distro, command, command, 1, 0, os.EX_OSERR)
# Create a new initial migration for baseTemplate
command = "/usr/local/CyberPanel/bin/python manage.py makemigrations baseTemplate --empty"
preFlightsChecks.call(command, self.distro, command, command, 1, 0, os.EX_OSERR)
# Try makemigrations again
command = "/usr/local/CyberPanel/bin/python manage.py makemigrations"
preFlightsChecks.call(command, self.distro, command, command, 1, 1, os.EX_OSERR)
##
command = "/usr/local/CyberPanel/bin/python manage.py migrate"
preFlightsChecks.call(command, self.distro, command, command, 1, 1, os.EX_OSERR)
# Apply migrations with fake-initial to handle missing initial migrations
command = "/usr/local/CyberPanel/bin/python manage.py migrate --fake-initial"
result = preFlightsChecks.call(command, self.distro, command, command, 1, 0, os.EX_OSERR)
# If fake-initial fails, try regular migrate
if result != 1:
command = "/usr/local/CyberPanel/bin/python manage.py migrate"
preFlightsChecks.call(command, self.distro, command, command, 1, 1, os.EX_OSERR)
if not os.path.exists("/usr/local/CyberCP/public"):
os.mkdir("/usr/local/CyberCP/public")