mirror of
https://github.com/usmannasir/cyberpanel.git
synced 2026-05-07 01:26:02 +02:00
install: port origin/v2.4.5 lscpd el9/10 selection, start retry, venv lscpd restart (e49ed16f)
- Use lscpd.0.4.0 on Alma 9/10 and RHEL-family VERSION_ID 9/10 - daemon-reload + retry systemctl start lscpd in setupLSCPDDaemon - 04_after_install: _restart_lscpd_safe + libxcrypt-compat on EL10 prereqs
This commit is contained in:
@@ -666,6 +666,7 @@ class preFlightsChecks:
|
||||
("dnf install -y epel-release", "EPEL"),
|
||||
("dnf config-manager --set-enabled crb 2>/dev/null || dnf config-manager --set-enabled powertools 2>/dev/null || true", "CRB/PowerTools"),
|
||||
("dnf install -y htop 2>/dev/null || true", "htop"),
|
||||
("dnf install -y libxcrypt-compat 2>/dev/null || true", "libxcrypt-compat for lscpd"),
|
||||
):
|
||||
self.call(cmd, self.distro, desc, desc, 1, 0, os.EX_OSERR)
|
||||
for cmd, desc in (
|
||||
@@ -4995,6 +4996,21 @@ user_query = SELECT email as user, password, 'vmail' as uid, 'vmail' as gid, '/h
|
||||
result = open('/etc/lsb-release', 'r').read()
|
||||
if result.find('22.04') > -1 or result.find('24.04') > -1:
|
||||
lscpdSelection = 'lscpd.0.4.0'
|
||||
# AlmaLinux/RHEL 9 and 10: lscpd.0.4.0 (el9 binary on el10; origin/v2.4.5)
|
||||
try:
|
||||
cl_al_ver = FetchCloudLinuxAlmaVersionVersion()
|
||||
if cl_al_ver in ('al-93', 'al-100'):
|
||||
lscpdSelection = 'lscpd.0.4.0'
|
||||
except Exception:
|
||||
pass
|
||||
if os.path.exists('/etc/os-release'):
|
||||
with open('/etc/os-release', 'r') as f:
|
||||
osrel = f.read()
|
||||
if (('VERSION_ID="9"' in osrel or 'VERSION_ID="10"' in osrel or
|
||||
'VERSION_ID="9.' in osrel or 'VERSION_ID="10.' in osrel) and
|
||||
('AlmaLinux' in osrel or 'Rocky' in osrel or 'Red Hat' in osrel or
|
||||
'CentOS' in osrel)):
|
||||
lscpdSelection = 'lscpd.0.4.0'
|
||||
else:
|
||||
lscpdSelection = 'lscpd.aarch64'
|
||||
|
||||
@@ -5005,6 +5021,12 @@ user_query = SELECT email as user, password, 'vmail' as uid, 'vmail' as gid, '/h
|
||||
result = open('/etc/lsb-release', 'r').read()
|
||||
if result.find('22.04') > -1 or result.find('24.04') > -1:
|
||||
lscpdSelection = 'lscpd.0.4.0'
|
||||
try:
|
||||
cl_al_ver = FetchCloudLinuxAlmaVersionVersion()
|
||||
if cl_al_ver in ('al-93', 'al-100'):
|
||||
lscpdSelection = 'lscpd.0.4.0'
|
||||
except Exception:
|
||||
pass
|
||||
|
||||
|
||||
command = f'cp -f /usr/local/CyberCP/{lscpdSelection} /usr/local/lscp/bin/{lscpdSelection}'
|
||||
@@ -5401,8 +5423,18 @@ user_query = SELECT email as user, password, 'vmail' as uid, 'vmail' as gid, '/h
|
||||
|
||||
##
|
||||
|
||||
command = 'systemctl daemon-reload'
|
||||
preFlightsChecks.call(command, self.distro, command, command, 1, 0, os.EX_OSERR)
|
||||
command = 'systemctl start lscpd'
|
||||
# preFlightsChecks.call(command, self.distro, command, command, 1, 0, os.EX_OSERR)
|
||||
ret = preFlightsChecks.call(command, self.distro, command, command, 0, 0, os.EX_OSERR)
|
||||
if ret != 0:
|
||||
preFlightsChecks.stdOut("LSCPD start failed, reloading systemd and retrying...")
|
||||
logging.InstallLog.writeToFile("LSCPD first start failed, retrying after daemon-reload")
|
||||
preFlightsChecks.call('systemctl daemon-reload', self.distro, 'daemon-reload', 'daemon-reload', 1, 0, os.EX_OSERR)
|
||||
ret = preFlightsChecks.call('systemctl start lscpd', self.distro, 'systemctl start lscpd', 'systemctl start lscpd', 0, 0, os.EX_OSERR)
|
||||
if ret != 0:
|
||||
preFlightsChecks.stdOut("[WARNING] LSCPD may not have started. Run: systemctl status lscpd")
|
||||
logging.InstallLog.writeToFile("[WARNING] LSCPD start failed after retry - run systemctl status lscpd")
|
||||
|
||||
preFlightsChecks.stdOut("LSCPD Daemon Set!")
|
||||
|
||||
|
||||
@@ -2,6 +2,17 @@
|
||||
# install/venvsetup part 4 – after_install
|
||||
|
||||
after_install() {
|
||||
# Robust lscpd restart (origin/v2.4.5 e49ed16f; EL9/10)
|
||||
_restart_lscpd_safe() {
|
||||
systemctl daemon-reload 2>/dev/null || true
|
||||
systemctl restart lscpd 2>/dev/null || true
|
||||
if ! systemctl is-active --quiet lscpd 2>/dev/null; then
|
||||
systemctl daemon-reload
|
||||
systemctl restart lscpd
|
||||
fi
|
||||
systemctl restart fastapi_ssh_server 2>/dev/null || true
|
||||
}
|
||||
|
||||
if [ ! -d "/var/lib/php" ]; then
|
||||
mkdir /var/lib/php
|
||||
fi
|
||||
@@ -51,7 +62,7 @@ fi
|
||||
|
||||
safe_pip_install "pip3.6" "requirements.txt" "--ignore-installed"
|
||||
pip3.6 install python-dotenv 2>/dev/null || echo "⚠️ python-dotenv (after_install) skipped or failed"
|
||||
systemctl restart lscpd
|
||||
_restart_lscpd_safe
|
||||
fi
|
||||
|
||||
for version in $(ls /usr/local/lsws | grep lsphp);
|
||||
@@ -113,7 +124,7 @@ ELAPSED="$(($SECONDS / 3600)) hrs $((($SECONDS / 60) % 60)) min $(($SECONDS % 60
|
||||
MYSQLPASSWD=$(cat /etc/cyberpanel/mysqlPassword)
|
||||
echo "$ADMIN_PASS" > /etc/cyberpanel/adminPass
|
||||
/usr/local/CyberPanel/bin/python2 /usr/local/CyberCP/plogical/adminPass.py --password $ADMIN_PASS
|
||||
systemctl restart lscpd
|
||||
_restart_lscpd_safe
|
||||
systemctl restart lsws
|
||||
echo "/usr/local/CyberPanel/bin/python2 /usr/local/CyberCP/plogical/adminPass.py --password \"\$@\"" > /usr/bin/adminPass
|
||||
echo "systemctl restart lscpd" >> /usr/bin/adminPass
|
||||
|
||||
Reference in New Issue
Block a user