From 525f8b308cb9af553b8a9c9f90b6a51a1b4d1539 Mon Sep 17 00:00:00 2001 From: Master3395 Date: Thu, 9 Oct 2025 23:05:16 +0200 Subject: [PATCH] =?UTF-8?q?Revert=20"Enhance=20OS=20detection=20and=20supp?= =?UTF-8?q?ort=20for=20AlmaLinux=2010=20and=20additional=20Ubun=E2=80=A6"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CPScripts/mailscannerinstaller.sh | 4 +- CPScripts/mailscanneruninstaller.sh | 4 +- INSTALLER_SUMMARY.md | 5 +- README.md | 2 +- cyberpanel.sh | 27 +------ cyberpanel_clean.sh | 27 +------ cyberpanel_complete.sh | 27 +------ cyberpanel_simple.sh | 27 +------ cyberpanel_standalone.sh | 27 +------ install/install.py | 107 ++-------------------------- install/install_utils.py | 4 +- install/universal_os_fixes.py | 2 +- modules/os/detect.sh | 26 ++----- simple_install.sh | 24 +------ 14 files changed, 28 insertions(+), 285 deletions(-) diff --git a/CPScripts/mailscannerinstaller.sh b/CPScripts/mailscannerinstaller.sh index 3dea79612..76a20e02d 100644 --- a/CPScripts/mailscannerinstaller.sh +++ b/CPScripts/mailscannerinstaller.sh @@ -55,13 +55,13 @@ elif grep -q -E "CloudLinux 7|CloudLinux 8" /etc/os-release ; then Server_OS="CloudLinux" elif grep -q -E "Rocky Linux" /etc/os-release ; then Server_OS="RockyLinux" -elif grep -q -E "Ubuntu 18.04|Ubuntu 20.04|Ubuntu 20.10|Ubuntu 22.04|Ubuntu 22.04.5|Ubuntu 24.04.3|Ubuntu 25.04|Ubuntu 25.10" /etc/os-release ; then +elif grep -q -E "Ubuntu 18.04|Ubuntu 20.04|Ubuntu 20.10|Ubuntu 22.04" /etc/os-release ; then Server_OS="Ubuntu" elif grep -q -E "openEuler 20.03|openEuler 22.03" /etc/os-release ; then Server_OS="openEuler" else echo -e "Unable to detect your system..." - echo -e "\nCyberPanel is supported on x86_64 based Ubuntu 18.04, Ubuntu 20.04, Ubuntu 20.10, Ubuntu 22.04, Ubuntu 22.04.5, Ubuntu 24.04.3, Ubuntu 25.04, Ubuntu 25.10, CentOS 7, CentOS 8, AlmaLinux 8, RockyLinux 8, CloudLinux 7, CloudLinux 8, openEuler 20.03, openEuler 22.03...\n" + echo -e "\nCyberPanel is supported on x86_64 based Ubuntu 18.04, Ubuntu 20.04, Ubuntu 20.10, Ubuntu 22.04, CentOS 7, CentOS 8, AlmaLinux 8, RockyLinux 8, CloudLinux 7, CloudLinux 8, openEuler 20.03, openEuler 22.03...\n" exit fi diff --git a/CPScripts/mailscanneruninstaller.sh b/CPScripts/mailscanneruninstaller.sh index aa70fb74e..9eebad670 100644 --- a/CPScripts/mailscanneruninstaller.sh +++ b/CPScripts/mailscanneruninstaller.sh @@ -12,13 +12,13 @@ elif grep -q -E "CloudLinux 7|CloudLinux 8" /etc/os-release ; then Server_OS="CloudLinux" elif grep -q -E "Rocky Linux" /etc/os-release ; then Server_OS="RockyLinux" -elif grep -q -E "Ubuntu 18.04|Ubuntu 20.04|Ubuntu 20.10|Ubuntu 22.04|Ubuntu 22.04.5|Ubuntu 24.04.3|Ubuntu 25.04|Ubuntu 25.10" /etc/os-release ; then +elif grep -q -E "Ubuntu 18.04|Ubuntu 20.04|Ubuntu 20.10|Ubuntu 22.04" /etc/os-release ; then Server_OS="Ubuntu" elif grep -q -E "openEuler 20.03|openEuler 22.03" /etc/os-release ; then Server_OS="openEuler" else echo -e "Unable to detect your system..." - echo -e "\nCyberPanel is supported on x86_64 based Ubuntu 18.04, Ubuntu 20.04, Ubuntu 20.10, Ubuntu 22.04, Ubuntu 22.04.5, Ubuntu 24.04.3, Ubuntu 25.04, Ubuntu 25.10, CentOS 7, CentOS 8, AlmaLinux 8, RockyLinux 8, CloudLinux 7, CloudLinux 8, openEuler 20.03, openEuler 22.03...\n" + echo -e "\nCyberPanel is supported on x86_64 based Ubuntu 18.04, Ubuntu 20.04, Ubuntu 20.10, Ubuntu 22.04, CentOS 7, CentOS 8, AlmaLinux 8, RockyLinux 8, CloudLinux 7, CloudLinux 8, openEuler 20.03, openEuler 22.03...\n" exit fi diff --git a/INSTALLER_SUMMARY.md b/INSTALLER_SUMMARY.md index 12681d126..458f6e0a3 100644 --- a/INSTALLER_SUMMARY.md +++ b/INSTALLER_SUMMARY.md @@ -92,11 +92,10 @@ bash <(curl https://raw.githubusercontent.com/usmannasir/cyberpanel/v2.5.5-dev/c ## 🔧 **Fixed Issues:** -### **✅ AlmaLinux 9/10 Support** +### **✅ AlmaLinux 9 Support** - Fixed `aspell` and `libc-client` dependency issues -- Proper package handling for AlmaLinux 9/10 +- Proper package handling for AlmaLinux 9 - Smart fallback for missing packages -- Comprehensive AlmaLinux 10 compatibility fixes ### **✅ Modular Architecture** - Each module under 500 lines (as requested) diff --git a/README.md b/README.md index 6184064fb..11a6adece 100755 --- a/README.md +++ b/README.md @@ -70,7 +70,7 @@ Fast • Secure • Scalable — Simplify hosting management with style. | OS family | Recommended / Supported | | -------------------------- | ----------------------: | -| Ubuntu 25.10, 25.04, 24.04.3, 24.04, 22.04.5, 22.04, 20.04 | ✅ Recommended | +| Ubuntu 24.04, 22.04, 20.04 | ✅ Recommended | | Debian 13, 12, 11 | ✅ Supported | | AlmaLinux 10, 9, 8 | ✅ Supported | | RockyLinux 9, 8 | ✅ Supported | diff --git a/cyberpanel.sh b/cyberpanel.sh index c1f54bb18..5655745f3 100644 --- a/cyberpanel.sh +++ b/cyberpanel.sh @@ -86,11 +86,6 @@ detect_os() { OS_FAMILY="rhel" PACKAGE_MANAGER="dnf" print_status "Detected: AlmaLinux 9" - elif echo $OUTPUT | grep -q "AlmaLinux 10" ; then - SERVER_OS="AlmaLinux10" - OS_FAMILY="rhel" - PACKAGE_MANAGER="dnf" - print_status "Detected: AlmaLinux 10" elif echo $OUTPUT | grep -q "AlmaLinux 8" ; then SERVER_OS="AlmaLinux8" OS_FAMILY="rhel" @@ -116,26 +111,6 @@ detect_os() { OS_FAMILY="rhel" PACKAGE_MANAGER="yum" print_status "Detected: Rocky Linux 8" - elif echo $OUTPUT | grep -q "Ubuntu 25.10" ; then - SERVER_OS="Ubuntu2510" - OS_FAMILY="debian" - PACKAGE_MANAGER="apt" - print_status "Detected: Ubuntu 25.10" - elif echo $OUTPUT | grep -q "Ubuntu 25.04" ; then - SERVER_OS="Ubuntu2504" - OS_FAMILY="debian" - PACKAGE_MANAGER="apt" - print_status "Detected: Ubuntu 25.04" - elif echo $OUTPUT | grep -q "Ubuntu 24.04.3" ; then - SERVER_OS="Ubuntu24043" - OS_FAMILY="debian" - PACKAGE_MANAGER="apt" - print_status "Detected: Ubuntu 24.04.3" - elif echo $OUTPUT | grep -q "Ubuntu 22.04.5" ; then - SERVER_OS="Ubuntu22045" - OS_FAMILY="debian" - PACKAGE_MANAGER="apt" - print_status "Detected: Ubuntu 22.04.5" elif echo $OUTPUT | grep -q "Ubuntu 22.04" ; then SERVER_OS="Ubuntu2204" OS_FAMILY="debian" @@ -158,7 +133,7 @@ detect_os() { print_status "Detected: Debian GNU/Linux 11" else print_status "ERROR: Unsupported OS detected" - print_status "Supported OS: AlmaLinux 8/9/10, CentOS 8/9, Rocky Linux 8/9, Ubuntu 20.04/22.04/22.04.5/24.04.3/25.04/25.10, Debian 11/12" + print_status "Supported OS: AlmaLinux 8/9, CentOS 8/9, Rocky Linux 8/9, Ubuntu 20.04/22.04, Debian 11/12" return 1 fi diff --git a/cyberpanel_clean.sh b/cyberpanel_clean.sh index e87ed602b..34edb731a 100644 --- a/cyberpanel_clean.sh +++ b/cyberpanel_clean.sh @@ -78,11 +78,6 @@ detect_os() { OS_FAMILY="rhel" PACKAGE_MANAGER="dnf" print_status "Detected: AlmaLinux 9" - elif echo $OUTPUT | grep -q "AlmaLinux 10" ; then - SERVER_OS="AlmaLinux10" - OS_FAMILY="rhel" - PACKAGE_MANAGER="dnf" - print_status "Detected: AlmaLinux 10" elif echo $OUTPUT | grep -q "AlmaLinux 8" ; then SERVER_OS="AlmaLinux8" OS_FAMILY="rhel" @@ -108,26 +103,6 @@ detect_os() { OS_FAMILY="rhel" PACKAGE_MANAGER="yum" print_status "Detected: Rocky Linux 8" - elif echo $OUTPUT | grep -q "Ubuntu 25.10" ; then - SERVER_OS="Ubuntu2510" - OS_FAMILY="debian" - PACKAGE_MANAGER="apt" - print_status "Detected: Ubuntu 25.10" - elif echo $OUTPUT | grep -q "Ubuntu 25.04" ; then - SERVER_OS="Ubuntu2504" - OS_FAMILY="debian" - PACKAGE_MANAGER="apt" - print_status "Detected: Ubuntu 25.04" - elif echo $OUTPUT | grep -q "Ubuntu 24.04.3" ; then - SERVER_OS="Ubuntu24043" - OS_FAMILY="debian" - PACKAGE_MANAGER="apt" - print_status "Detected: Ubuntu 24.04.3" - elif echo $OUTPUT | grep -q "Ubuntu 22.04.5" ; then - SERVER_OS="Ubuntu22045" - OS_FAMILY="debian" - PACKAGE_MANAGER="apt" - print_status "Detected: Ubuntu 22.04.5" elif echo $OUTPUT | grep -q "Ubuntu 22.04" ; then SERVER_OS="Ubuntu2204" OS_FAMILY="debian" @@ -150,7 +125,7 @@ detect_os() { print_status "Detected: Debian GNU/Linux 11" else print_status "ERROR: Unsupported OS detected" - print_status "Supported OS: AlmaLinux 8/9/10, CentOS 8/9, Rocky Linux 8/9, Ubuntu 20.04/22.04/22.04.5/24.04.3/25.04/25.10, Debian 11/12" + print_status "Supported OS: AlmaLinux 8/9, CentOS 8/9, Rocky Linux 8/9, Ubuntu 20.04/22.04, Debian 11/12" return 1 fi diff --git a/cyberpanel_complete.sh b/cyberpanel_complete.sh index ce149dffa..6d276d9c3 100644 --- a/cyberpanel_complete.sh +++ b/cyberpanel_complete.sh @@ -90,11 +90,6 @@ detect_os() { OS_FAMILY="rhel" PACKAGE_MANAGER="dnf" print_status "$GREEN" "Detected: AlmaLinux 9" - elif echo $OUTPUT | grep -q "AlmaLinux 10" ; then - SERVER_OS="AlmaLinux10" - OS_FAMILY="rhel" - PACKAGE_MANAGER="dnf" - print_status "$GREEN" "Detected: AlmaLinux 10" elif echo $OUTPUT | grep -q "AlmaLinux 8" ; then SERVER_OS="AlmaLinux8" OS_FAMILY="rhel" @@ -120,26 +115,6 @@ detect_os() { OS_FAMILY="rhel" PACKAGE_MANAGER="yum" print_status "$GREEN" "Detected: Rocky Linux 8" - elif echo $OUTPUT | grep -q "Ubuntu 25.10" ; then - SERVER_OS="Ubuntu2510" - OS_FAMILY="debian" - PACKAGE_MANAGER="apt" - print_status "$GREEN" "Detected: Ubuntu 25.10" - elif echo $OUTPUT | grep -q "Ubuntu 25.04" ; then - SERVER_OS="Ubuntu2504" - OS_FAMILY="debian" - PACKAGE_MANAGER="apt" - print_status "$GREEN" "Detected: Ubuntu 25.04" - elif echo $OUTPUT | grep -q "Ubuntu 24.04.3" ; then - SERVER_OS="Ubuntu24043" - OS_FAMILY="debian" - PACKAGE_MANAGER="apt" - print_status "$GREEN" "Detected: Ubuntu 24.04.3" - elif echo $OUTPUT | grep -q "Ubuntu 22.04.5" ; then - SERVER_OS="Ubuntu22045" - OS_FAMILY="debian" - PACKAGE_MANAGER="apt" - print_status "$GREEN" "Detected: Ubuntu 22.04.5" elif echo $OUTPUT | grep -q "Ubuntu 22.04" ; then SERVER_OS="Ubuntu2204" OS_FAMILY="debian" @@ -162,7 +137,7 @@ detect_os() { print_status "$GREEN" "Detected: Debian GNU/Linux 11" else print_status "$RED" "❌ Unsupported OS detected" - print_status "$YELLOW" "Supported OS: AlmaLinux 8/9/10, CentOS 8/9, Rocky Linux 8/9, Ubuntu 20.04/22.04/22.04.5/24.04.3/25.04/25.10, Debian 11/12" + print_status "$YELLOW" "Supported OS: AlmaLinux 8/9, CentOS 8/9, Rocky Linux 8/9, Ubuntu 20.04/22.04, Debian 11/12" return 1 fi diff --git a/cyberpanel_simple.sh b/cyberpanel_simple.sh index ea86d3827..5f469dbf8 100644 --- a/cyberpanel_simple.sh +++ b/cyberpanel_simple.sh @@ -76,11 +76,6 @@ detect_os() { OS_FAMILY="rhel" PACKAGE_MANAGER="dnf" print_status "Detected: AlmaLinux 9" - elif echo $OUTPUT | grep -q "AlmaLinux 10" ; then - SERVER_OS="AlmaLinux10" - OS_FAMILY="rhel" - PACKAGE_MANAGER="dnf" - print_status "Detected: AlmaLinux 10" elif echo $OUTPUT | grep -q "AlmaLinux 8" ; then SERVER_OS="AlmaLinux8" OS_FAMILY="rhel" @@ -106,26 +101,6 @@ detect_os() { OS_FAMILY="rhel" PACKAGE_MANAGER="yum" print_status "Detected: Rocky Linux 8" - elif echo $OUTPUT | grep -q "Ubuntu 25.10" ; then - SERVER_OS="Ubuntu2510" - OS_FAMILY="debian" - PACKAGE_MANAGER="apt" - print_status "Detected: Ubuntu 25.10" - elif echo $OUTPUT | grep -q "Ubuntu 25.04" ; then - SERVER_OS="Ubuntu2504" - OS_FAMILY="debian" - PACKAGE_MANAGER="apt" - print_status "Detected: Ubuntu 25.04" - elif echo $OUTPUT | grep -q "Ubuntu 24.04.3" ; then - SERVER_OS="Ubuntu24043" - OS_FAMILY="debian" - PACKAGE_MANAGER="apt" - print_status "Detected: Ubuntu 24.04.3" - elif echo $OUTPUT | grep -q "Ubuntu 22.04.5" ; then - SERVER_OS="Ubuntu22045" - OS_FAMILY="debian" - PACKAGE_MANAGER="apt" - print_status "Detected: Ubuntu 22.04.5" elif echo $OUTPUT | grep -q "Ubuntu 22.04" ; then SERVER_OS="Ubuntu2204" OS_FAMILY="debian" @@ -148,7 +123,7 @@ detect_os() { print_status "Detected: Debian GNU/Linux 11" else print_status "ERROR: Unsupported OS detected" - print_status "Supported OS: AlmaLinux 8/9/10, CentOS 8/9, Rocky Linux 8/9, Ubuntu 20.04/22.04/22.04.5/24.04.3/25.04/25.10, Debian 11/12" + print_status "Supported OS: AlmaLinux 8/9, CentOS 8/9, Rocky Linux 8/9, Ubuntu 20.04/22.04, Debian 11/12" return 1 fi diff --git a/cyberpanel_standalone.sh b/cyberpanel_standalone.sh index 3083cdea2..5951af816 100644 --- a/cyberpanel_standalone.sh +++ b/cyberpanel_standalone.sh @@ -89,11 +89,6 @@ detect_os() { OS_FAMILY="rhel" PACKAGE_MANAGER="dnf" print_status "$GREEN" "Detected: AlmaLinux 9" - elif echo $OUTPUT | grep -q "AlmaLinux 10" ; then - SERVER_OS="AlmaLinux10" - OS_FAMILY="rhel" - PACKAGE_MANAGER="dnf" - print_status "$GREEN" "Detected: AlmaLinux 10" elif echo $OUTPUT | grep -q "AlmaLinux 8" ; then SERVER_OS="AlmaLinux8" OS_FAMILY="rhel" @@ -119,26 +114,6 @@ detect_os() { OS_FAMILY="rhel" PACKAGE_MANAGER="yum" print_status "$GREEN" "Detected: Rocky Linux 8" - elif echo $OUTPUT | grep -q "Ubuntu 25.10" ; then - SERVER_OS="Ubuntu2510" - OS_FAMILY="debian" - PACKAGE_MANAGER="apt" - print_status "$GREEN" "Detected: Ubuntu 25.10" - elif echo $OUTPUT | grep -q "Ubuntu 25.04" ; then - SERVER_OS="Ubuntu2504" - OS_FAMILY="debian" - PACKAGE_MANAGER="apt" - print_status "$GREEN" "Detected: Ubuntu 25.04" - elif echo $OUTPUT | grep -q "Ubuntu 24.04.3" ; then - SERVER_OS="Ubuntu24043" - OS_FAMILY="debian" - PACKAGE_MANAGER="apt" - print_status "$GREEN" "Detected: Ubuntu 24.04.3" - elif echo $OUTPUT | grep -q "Ubuntu 22.04.5" ; then - SERVER_OS="Ubuntu22045" - OS_FAMILY="debian" - PACKAGE_MANAGER="apt" - print_status "$GREEN" "Detected: Ubuntu 22.04.5" elif echo $OUTPUT | grep -q "Ubuntu 22.04" ; then SERVER_OS="Ubuntu2204" OS_FAMILY="debian" @@ -161,7 +136,7 @@ detect_os() { print_status "$GREEN" "Detected: Debian GNU/Linux 11" else print_status "$RED" "❌ Unsupported OS detected" - print_status "$YELLOW" "Supported OS: AlmaLinux 8/9/10, CentOS 8/9, Rocky Linux 8/9, Ubuntu 20.04/22.04/22.04.5/24.04.3/25.04/25.10, Debian 11/12" + print_status "$YELLOW" "Supported OS: AlmaLinux 8/9, CentOS 8/9, Rocky Linux 8/9, Ubuntu 20.04/22.04, Debian 11/12" return 1 fi diff --git a/install/install.py b/install/install.py index d213afa30..52d4c17b6 100644 --- a/install/install.py +++ b/install/install.py @@ -169,11 +169,6 @@ class preFlightsChecks: os_info = self.detect_os_info() return os_info['name'] == 'almalinux' and os_info['major_version'] == 9 - def is_almalinux10(self): - """Check if running on AlmaLinux 10""" - os_info = self.detect_os_info() - return os_info['name'] == 'almalinux' and os_info['major_version'] == 10 - def is_ubuntu(self): """Check if running on Ubuntu""" os_info = self.detect_os_info() @@ -197,7 +192,7 @@ class preFlightsChecks: if os_info['name'] == 'almalinux' and os_info['major_version'] == 9: fixes.extend(['mariadb', 'services', 'litespeed', 'mysql_gpg']) elif os_info['name'] == 'almalinux' and os_info['major_version'] == 10: - fixes.extend(['mariadb', 'services', 'litespeed', 'mysql_gpg']) + fixes.extend(['mariadb', 'services', 'litespeed']) elif os_info['name'] == 'rocky' and os_info['major_version'] >= 8: fixes.extend(['mariadb', 'services']) elif os_info['name'] == 'rhel' and os_info['major_version'] >= 8: @@ -321,10 +316,10 @@ class preFlightsChecks: if not installed: self.stdOut(f"Package {package} not available, trying alternatives...", 1) - # For AlmaLinux 9/10, try enabling PowerTools repository first - if self.distro == openeuler and os_info['name'] == 'almalinux' and os_info['major_version'] in ['9', '10']: + # For AlmaLinux 9, try enabling PowerTools repository first + if self.distro == openeuler and os_info['name'] == 'almalinux' and os_info['major_version'] == '9': try: - self.stdOut("Enabling AlmaLinux 9/10 PowerTools repository...", 1) + self.stdOut("Enabling AlmaLinux 9 PowerTools repository...", 1) self.call("dnf config-manager --set-enabled powertools", self.distro, "Enable PowerTools", "Enable PowerTools", 1, 0, os.EX_OSERR) # Try installing again with PowerTools enabled command = f"dnf install -y {package} {dev_package}" @@ -751,92 +746,6 @@ class preFlightsChecks: self.stdOut(f"Error in fix_debian_specific: {str(e)}", 0) return False - def fix_almalinux10_comprehensive(self): - """Apply comprehensive AlmaLinux 10 fixes""" - if not self.is_almalinux10(): - return - - self.stdOut("Applying comprehensive AlmaLinux 10 fixes...", 1) - - try: - # Update system packages - self.stdOut("Updating system packages...", 1) - command = "dnf update -y" - self.call(command, self.distro, command, command, 1, 0, os.EX_OSERR) - - # Install essential build tools and dependencies - self.stdOut("Installing essential build tools...", 1) - command = "dnf groupinstall -y 'Development Tools'" - self.call(command, self.distro, command, command, 1, 0, os.EX_OSERR) - - command = "dnf install -y epel-release" - self.call(command, self.distro, command, command, 1, 0, os.EX_OSERR) - - # Install AlmaLinux 10 compatibility packages (same as AlmaLinux 9) - self.stdOut("Installing AlmaLinux 10 compatibility packages...", 1) - compat_packages = [ - "libxcrypt-compat", - "libnsl", - "compat-openssl11", - "compat-openssl11-devel" - ] - - for package in compat_packages: - command = f"dnf install -y {package}" - self.call(command, self.distro, command, command, 1, 0, os.EX_OSERR) - - # Install PHP dependencies that are missing (with AlmaLinux 10 compatibility) - self.stdOut("Installing PHP dependencies...", 1) - - # Base packages that should work on all systems - base_deps = [ - "ImageMagick", "ImageMagick-devel", - "gd", "gd-devel", - "libicu", "libicu-devel", - "oniguruma", "oniguruma-devel", - "aspell", "aspell-devel", - "freetype-devel", - "libjpeg-turbo-devel", - "libpng-devel", - "libwebp-devel", - "libXpm-devel", - "libzip-devel", - "libxml2-devel", - "openssl-devel", - "curl-devel", - "libxslt-devel", - "sqlite-devel", - "readline-devel", - "libedit-devel", - "pcre2-devel", - "re2c", - "libargon2-devel", - "libsodium-devel" - ] - - for package in base_deps: - command = f"dnf install -y {package}" - self.call(command, self.distro, command, command, 1, 0, os.EX_OSERR) - - # Install MariaDB development packages - self.stdOut("Installing MariaDB development packages...", 1) - mariadb_deps = [ - "mariadb-devel", - "mariadb-connector-c-devel" - ] - - for package in mariadb_deps: - command = f"dnf install -y {package}" - self.call(command, self.distro, command, command, 1, 0, os.EX_OSERR) - - self.stdOut("✅ AlmaLinux 10 fixes applied successfully", 1) - - except Exception as e: - self.stdOut(f"❌ Error applying AlmaLinux 10 fixes: {e}", 1) - return False - - return True - def apply_os_specific_fixes(self): """Apply OS-specific fixes based on detected OS""" try: @@ -1986,7 +1895,7 @@ class preFlightsChecks: # Use compatible repository version for RHEL-based systems # AlmaLinux 9 is compatible with el8 repositories os_info = self.detect_os_info() - if os_info['name'] in ['almalinux', 'rocky', 'rhel'] and os_info['major_version'] in ['8', '9', '10']: + if os_info['name'] in ['almalinux', 'rocky', 'rhel'] and os_info['major_version'] in ['8', '9']: command = 'rpm -Uvh http://rpms.litespeedtech.com/centos/litespeed-repo-1.1-1.el8.noarch.rpm' else: command = 'rpm -Uvh http://rpms.litespeedtech.com/centos/litespeed-repo-1.1-1.el8.noarch.rpm' @@ -4532,7 +4441,7 @@ milter_default_action = accept # Use compatible repository version for RHEL-based systems # AlmaLinux 9 is compatible with el8 repositories os_info = self.detect_os_info() - if os_info['name'] in ['almalinux', 'rocky', 'rhel'] and os_info['major_version'] in ['8', '9', '10']: + if os_info['name'] in ['almalinux', 'rocky', 'rhel'] and os_info['major_version'] in ['8', '9']: repo_command = 'rpm -Uvh http://rpms.litespeedtech.com/centos/litespeed-repo-1.1-1.el8.noarch.rpm' else: repo_command = 'rpm -Uvh http://rpms.litespeedtech.com/centos/litespeed-repo-1.1-1.el8.noarch.rpm' @@ -5589,11 +5498,9 @@ def main(): # Note: OS-specific fixes are now applied earlier in the installation process # The installCyberPanel.Main() functionality has been integrated into the main installation flow - # Apply AlmaLinux 9/10 comprehensive fixes first if needed + # Apply AlmaLinux 9 comprehensive fixes first if needed if checks.is_almalinux9(): checks.fix_almalinux9_comprehensive() - elif checks.is_almalinux10(): - checks.fix_almalinux10_comprehensive() # Install core services in the correct order checks.installLiteSpeed(ent, serial) diff --git a/install/install_utils.py b/install/install_utils.py index 546ee5085..07982c0c0 100644 --- a/install/install_utils.py +++ b/install/install_utils.py @@ -34,8 +34,6 @@ def FetchCloudLinuxAlmaVersionVersion(): return 'al-87' elif (data.find('AlmaLinux') > -1 or data.find('almalinux') > -1) and (data.find('9.4') > -1 or data.find('9.3') > -1 or data.find('Shamrock Pampas') > -1 or data.find('Seafoam Ocelot') > -1 or data.find('VERSION="9.') > -1): return 'al-93' - elif (data.find('AlmaLinux') > -1 or data.find('almalinux') > -1) and (data.find('10.0') > -1 or data.find('Purple Lion') > -1 or data.find('VERSION="10.') > -1): - return 'al-10' elif data.find('CentOS Stream 9') > -1: return 'el-9' elif data.find('CentOS Linux 9') > -1: @@ -44,6 +42,8 @@ def FetchCloudLinuxAlmaVersionVersion(): return 'el-9' elif data.find('Red Hat Enterprise Linux 9') > -1: return 'el-9' + elif (data.find('AlmaLinux') > -1 or data.find('almalinux') > -1) and (data.find('10.0') > -1 or data.find('Purple Lion') > -1 or data.find('VERSION="10.') > -1): + return 'al-100' else: return -1 diff --git a/install/universal_os_fixes.py b/install/universal_os_fixes.py index 979eb1373..eea45dc19 100644 --- a/install/universal_os_fixes.py +++ b/install/universal_os_fixes.py @@ -21,7 +21,7 @@ class UniversalOSFixes: # Supported OS matrix self.supported_os = { - 'ubuntu': ['25.10', '25.04', '24.04.3', '24.04', '22.04.5', '22.04', '20.04'], + 'ubuntu': ['24.04', '22.04', '20.04'], 'debian': ['13', '12', '11'], 'almalinux': ['10', '9', '8'], 'rocky': ['9', '8'], diff --git a/modules/os/detect.sh b/modules/os/detect.sh index 63b1db9c7..0d0d3550c 100644 --- a/modules/os/detect.sh +++ b/modules/os/detect.sh @@ -206,17 +206,11 @@ detect_ubuntu() { PACKAGE_MANAGER="apt" print_status "$GREEN" "Detected: Ubuntu 22.04" return 0 - elif echo $OUTPUT | grep -q "Ubuntu 25.10" ; then - SERVER_OS="Ubuntu2510" + elif echo $OUTPUT | grep -q "Ubuntu 24.04" ; then + SERVER_OS="Ubuntu2404" OS_FAMILY="debian" PACKAGE_MANAGER="apt" - print_status "$GREEN" "Detected: Ubuntu 25.10" - return 0 - elif echo $OUTPUT | grep -q "Ubuntu 25.04" ; then - SERVER_OS="Ubuntu2504" - OS_FAMILY="debian" - PACKAGE_MANAGER="apt" - print_status "$GREEN" "Detected: Ubuntu 25.04" + print_status "$GREEN" "Detected: Ubuntu 24.04" return 0 elif echo $OUTPUT | grep -q "Ubuntu 24.04.3" ; then SERVER_OS="Ubuntu24043" @@ -224,18 +218,6 @@ detect_ubuntu() { PACKAGE_MANAGER="apt" print_status "$GREEN" "Detected: Ubuntu 24.04.3" return 0 - elif echo $OUTPUT | grep -q "Ubuntu 22.04.5" ; then - SERVER_OS="Ubuntu22045" - OS_FAMILY="debian" - PACKAGE_MANAGER="apt" - print_status "$GREEN" "Detected: Ubuntu 22.04.5" - return 0 - elif echo $OUTPUT | grep -q "Ubuntu 24.04" ; then - SERVER_OS="Ubuntu2404" - OS_FAMILY="debian" - PACKAGE_MANAGER="apt" - print_status "$GREEN" "Detected: Ubuntu 24.04" - return 0 fi return 1 } @@ -329,7 +311,7 @@ detect_os() { else print_status "$RED" "❌ Unable to detect your OS..." print_status "$YELLOW" "Supported operating systems:" - echo -e "• Ubuntu: 18.04, 20.04, 20.10, 22.04, 22.04.5, 24.04, 24.04.3, 25.04, 25.10" + echo -e "• Ubuntu: 18.04, 20.04, 20.10, 22.04, 24.04, 24.04.3" echo -e "• Debian: 11, 12, 13" echo -e "• AlmaLinux: 8, 9, 10" echo -e "• RockyLinux: 8, 9" diff --git a/simple_install.sh b/simple_install.sh index e65c49d33..3d3cdb5b8 100644 --- a/simple_install.sh +++ b/simple_install.sh @@ -10,30 +10,10 @@ if echo $OUTPUT | grep -q "AlmaLinux 9" ; then echo -e "\nDetecting AlmaLinux 9...\n" SERVER_OS="AlmaLinux9" PKG_MGR="dnf" -elif echo $OUTPUT | grep -q "AlmaLinux 10" ; then - echo -e "\nDetecting AlmaLinux 10...\n" - SERVER_OS="AlmaLinux10" - PKG_MGR="dnf" elif echo $OUTPUT | grep -q "AlmaLinux 8" ; then echo -e "\nDetecting AlmaLinux 8...\n" SERVER_OS="AlmaLinux8" PKG_MGR="yum" -elif echo $OUTPUT | grep -q "Ubuntu 25.10" ; then - echo -e "\nDetecting Ubuntu 25.10...\n" - SERVER_OS="Ubuntu2510" - PKG_MGR="apt" -elif echo $OUTPUT | grep -q "Ubuntu 25.04" ; then - echo -e "\nDetecting Ubuntu 25.04...\n" - SERVER_OS="Ubuntu2504" - PKG_MGR="apt" -elif echo $OUTPUT | grep -q "Ubuntu 24.04.3" ; then - echo -e "\nDetecting Ubuntu 24.04.3...\n" - SERVER_OS="Ubuntu24043" - PKG_MGR="apt" -elif echo $OUTPUT | grep -q "Ubuntu 22.04.5" ; then - echo -e "\nDetecting Ubuntu 22.04.5...\n" - SERVER_OS="Ubuntu22045" - PKG_MGR="apt" elif echo $OUTPUT | grep -q "Ubuntu 22.04" ; then echo -e "\nDetecting Ubuntu 22.04...\n" SERVER_OS="Ubuntu2204" @@ -48,8 +28,8 @@ elif echo $OUTPUT | grep -q "CentOS Linux 8" ; then PKG_MGR="yum" else echo -e "\nUnsupported OS detected. This script supports:\n" - echo -e "AlmaLinux: 8, 9, 10\n" - echo -e "Ubuntu: 20.04, 22.04, 22.04.5, 24.04.3, 25.04, 25.10\n" + echo -e "AlmaLinux: 8, 9\n" + echo -e "Ubuntu: 20.04, 22.04\n" echo -e "CentOS: 8\n" exit 1 fi