diff --git a/CPScripts/mailscannerinstaller.sh b/CPScripts/mailscannerinstaller.sh index 9175cd102..917c678a3 100644 --- a/CPScripts/mailscannerinstaller.sh +++ b/CPScripts/mailscannerinstaller.sh @@ -49,7 +49,7 @@ Server_OS="" Server_OS_Version="" if grep -q -E "CentOS Linux 7|CentOS Linux 8" /etc/os-release ; then Server_OS="CentOS" -elif grep -q "AlmaLinux-8" /etc/os-release ; then +elif grep -q -E "AlmaLinux-8|AlmaLinux-9|AlmaLinux-10" /etc/os-release ; then Server_OS="AlmaLinux" elif grep -q -E "CloudLinux 7|CloudLinux 8" /etc/os-release ; then Server_OS="CloudLinux" diff --git a/CPScripts/mailscanneruninstaller.sh b/CPScripts/mailscanneruninstaller.sh index 2061fe9df..9eebad670 100644 --- a/CPScripts/mailscanneruninstaller.sh +++ b/CPScripts/mailscanneruninstaller.sh @@ -6,7 +6,7 @@ Server_OS="" Server_OS_Version="" if grep -q -E "CentOS Linux 7|CentOS Linux 8" /etc/os-release ; then Server_OS="CentOS" -elif grep -q "AlmaLinux-8" /etc/os-release ; then +elif grep -q -E "AlmaLinux-8|AlmaLinux-9|AlmaLinux-10" /etc/os-release ; then Server_OS="AlmaLinux" elif grep -q -E "CloudLinux 7|CloudLinux 8" /etc/os-release ; then Server_OS="CloudLinux" diff --git a/README.md b/README.md index d95047b3e..ba0de95c1 100755 --- a/README.md +++ b/README.md @@ -77,6 +77,7 @@ CyberPanel runs on x86_64 architecture and supports the following operating syst - **Ubuntu 22.04** - Supported until April 2027 - **Ubuntu 20.04** - Supported until April 2025 +- **AlmaLinux 10** - Active support until May 2030, security support until May 2035 - **AlmaLinux 9** - Supported until May 2032 - **AlmaLinux 8** - Supported until May 2029 - **RockyLinux 9** - Supported until May 2032 diff --git a/cyberpanel.sh b/cyberpanel.sh index afb9b32fa..d8d7e6783 100644 --- a/cyberpanel.sh +++ b/cyberpanel.sh @@ -530,6 +530,8 @@ elif grep -q "AlmaLinux-8" /etc/os-release ; then Server_OS="AlmaLinux" elif grep -q "AlmaLinux-9" /etc/os-release ; then Server_OS="AlmaLinux" +elif grep -q "AlmaLinux-10" /etc/os-release ; then + Server_OS="AlmaLinux" 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 @@ -540,8 +542,8 @@ 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 24.04, CentOS 7, CentOS 8, CentOS 9, RHEL 8, RHEL 9, AlmaLinux 8, AlmaLinux 9, RockyLinux 8, CloudLinux 7, CloudLinux 8, openEuler 20.03, openEuler 22.03...\n" - Debug_Log2 "CyberPanel is supported on x86_64 based Ubuntu 18.04, Ubuntu 20.04, Ubuntu 20.10, Ubuntu 22.04, Ubuntu 24.04, CentOS 7, CentOS 8, CentOS 9, RHEL 8, RHEL 9, AlmaLinux 8, RockyLinux 8, AlmaLinux 9, CloudLinux 7, CloudLinux 8, openEuler 20.03, openEuler 22.03... [404]" + echo -e "\nCyberPanel is supported on x86_64 based Ubuntu 18.04, Ubuntu 20.04, Ubuntu 20.10, Ubuntu 22.04, Ubuntu 24.04, CentOS 7, CentOS 8, CentOS 9, RHEL 8, RHEL 9, AlmaLinux 8, AlmaLinux 9, AlmaLinux 10, RockyLinux 8, CloudLinux 7, CloudLinux 8, openEuler 20.03, openEuler 22.03...\n" + Debug_Log2 "CyberPanel is supported on x86_64 based Ubuntu 18.04, Ubuntu 20.04, Ubuntu 20.10, Ubuntu 22.04, Ubuntu 24.04, CentOS 7, CentOS 8, CentOS 9, RHEL 8, RHEL 9, AlmaLinux 8, AlmaLinux 9, AlmaLinux 10, RockyLinux 8, CloudLinux 7, CloudLinux 8, openEuler 20.03, openEuler 22.03... [404]" exit fi diff --git a/cyberpanel_upgrade.sh b/cyberpanel_upgrade.sh index 77ca25454..3baccc7ec 100644 --- a/cyberpanel_upgrade.sh +++ b/cyberpanel_upgrade.sh @@ -149,7 +149,7 @@ elif grep -q -E "CloudLinux 7|CloudLinux 8|CloudLinux 9" /etc/os-release ; then Server_OS="CloudLinux" elif grep -q -E "Rocky Linux" /etc/os-release ; then Server_OS="RockyLinux" -elif grep -q -E "AlmaLinux-8|AlmaLinux-9" /etc/os-release ; then +elif grep -q -E "AlmaLinux-8|AlmaLinux-9|AlmaLinux-10" /etc/os-release ; then Server_OS="AlmaLinux" elif grep -q -E "Ubuntu 18.04|Ubuntu 20.04|Ubuntu 20.10|Ubuntu 22.04|Ubuntu 24.04" /etc/os-release ; then Server_OS="Ubuntu" @@ -157,8 +157,8 @@ 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 24.04, CentOS 7, CentOS 8, AlmaLinux 8, RockyLinux 8, CloudLinux 7, CloudLinux 8, CloudLinux 9, openEuler 20.03, openEuler 22.03...\n" - Debug_Log2 "CyberPanel is supported on x86_64 based Ubuntu 18.04, Ubuntu 20.04, Ubuntu 20.10, Ubuntu 22.04, Ubuntu 24.04, CentOS 7, CentOS 8, AlmaLinux 8, RockyLinux 8, CloudLinux 7, CloudLinux 8, CloudLinux 9, openEuler 20.03, openEuler 22.03... [404]" + echo -e "\nCyberPanel is supported on x86_64 based Ubuntu 18.04, Ubuntu 20.04, Ubuntu 20.10, Ubuntu 22.04, Ubuntu 24.04, CentOS 7, CentOS 8, AlmaLinux 8, AlmaLinux 9, AlmaLinux 10, RockyLinux 8, CloudLinux 7, CloudLinux 8, CloudLinux 9, openEuler 20.03, openEuler 22.03...\n" + Debug_Log2 "CyberPanel is supported on x86_64 based Ubuntu 18.04, Ubuntu 20.04, Ubuntu 20.10, Ubuntu 22.04, Ubuntu 24.04, CentOS 7, CentOS 8, AlmaLinux 8, AlmaLinux 9, AlmaLinux 10, RockyLinux 8, CloudLinux 7, CloudLinux 8, CloudLinux 9, openEuler 20.03, openEuler 22.03... [404]" exit fi diff --git a/cyberpanel_utility.sh b/cyberpanel_utility.sh index 5b41a2001..31d1607f9 100644 --- a/cyberpanel_utility.sh +++ b/cyberpanel_utility.sh @@ -17,7 +17,7 @@ check_OS() { Server_OS="CentOS" elif grep -q "Red Hat Enterprise Linux" /etc/os-release ; then Server_OS="RedHat" - elif grep -q "AlmaLinux-8" /etc/os-release ; then + elif grep -q -E "AlmaLinux-8|AlmaLinux-9|AlmaLinux-10" /etc/os-release ; then Server_OS="AlmaLinux" elif grep -q -E "CloudLinux 7|CloudLinux 8" /etc/os-release ; then Server_OS="CloudLinux" @@ -29,7 +29,7 @@ check_OS() { 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, 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, AlmaLinux 9, AlmaLinux 10, RockyLinux 8, CloudLinux 7, CloudLinux 8, openEuler 20.03, openEuler 22.03...\n" exit fi diff --git a/install.sh b/install.sh index 187bcb6c0..28ae56bdb 100644 --- a/install.sh +++ b/install.sh @@ -21,6 +21,11 @@ elif echo $OUTPUT | grep -q "AlmaLinux 9" ; then SERVER_OS="CentOS8" yum install curl wget -y 1> /dev/null yum update curl wget ca-certificates -y 1> /dev/null +elif echo $OUTPUT | grep -q "AlmaLinux 10" ; then + echo -e "\nDetecting AlmaLinux 10...\n" + SERVER_OS="CentOS8" +yum install curl wget -y 1> /dev/null +yum update curl wget ca-certificates -y 1> /dev/null elif echo $OUTPUT | grep -q "CloudLinux 7" ; then echo "Checking and installing curl and wget" yum install curl wget -y 1> /dev/null @@ -53,7 +58,7 @@ yum update curl wget ca-certificates -y 1> /dev/null else echo -e "\nUnable to detect your OS...\n" - echo -e "\nCyberPanel is supported on Ubuntu 18.04, Ubuntu 20.04 Ubuntu 22.04, AlmaLinux 8, AlmaLinux 9 and CloudLinux 7.x...\n" + echo -e "\nCyberPanel is supported on Ubuntu 18.04, Ubuntu 20.04 Ubuntu 22.04, AlmaLinux 8, AlmaLinux 9, AlmaLinux 10 and CloudLinux 7.x...\n" exit 1 fi diff --git a/install/install.py b/install/install.py index 4d61a4000..862e5de83 100644 --- a/install/install.py +++ b/install/install.py @@ -2226,6 +2226,18 @@ milter_default_action = accept def setupPHPSymlink(self): try: + # Check if PHP 8.2 exists + if not os.path.exists('/usr/local/lsws/lsphp82/bin/php'): + logging.InstallLog.writeToFile("[setupPHPSymlink] PHP 8.2 not found, ensuring it's installed...") + + # Install PHP 8.2 based on OS + if self.distro == centos or self.distro == cent8 or self.distro == openeuler: + command = 'yum install lsphp82 lsphp82-* -y' + else: + command = 'DEBIAN_FRONTEND=noninteractive apt-get update && DEBIAN_FRONTEND=noninteractive apt-get -y install lsphp82 lsphp82-*' + + preFlightsChecks.call(command, self.distro, command, command, 1, 0, os.EX_OSERR) + # Check if PHP 8.3 exists if not os.path.exists('/usr/local/lsws/lsphp83/bin/php'): logging.InstallLog.writeToFile("[setupPHPSymlink] PHP 8.3 not found, ensuring it's installed...") @@ -2242,12 +2254,34 @@ milter_default_action = accept if not os.path.exists('/usr/local/lsws/lsphp83/bin/php'): logging.InstallLog.writeToFile('[ERROR] Failed to install PHP 8.3') return 0 + + # Install PHP 8.4 + if not os.path.exists('/usr/local/lsws/lsphp84/bin/php'): + logging.InstallLog.writeToFile("[setupPHPSymlink] PHP 8.4 not found, ensuring it's installed...") + + if self.distro == centos or self.distro == cent8 or self.distro == openeuler: + command = 'yum install lsphp84 lsphp84-* -y' + else: + command = 'DEBIAN_FRONTEND=noninteractive apt-get update && DEBIAN_FRONTEND=noninteractive apt-get -y install lsphp84 lsphp84-*' + + preFlightsChecks.call(command, self.distro, command, command, 1, 0, os.EX_OSERR) + + # Install PHP 8.5 + if not os.path.exists('/usr/local/lsws/lsphp85/bin/php'): + logging.InstallLog.writeToFile("[setupPHPSymlink] PHP 8.5 not found, ensuring it's installed...") + + if self.distro == centos or self.distro == cent8 or self.distro == openeuler: + command = 'yum install lsphp85 lsphp85-* -y' + else: + command = 'DEBIAN_FRONTEND=noninteractive apt-get update && DEBIAN_FRONTEND=noninteractive apt-get -y install lsphp85 lsphp85-*' + + preFlightsChecks.call(command, self.distro, command, command, 1, 0, os.EX_OSERR) # Remove existing PHP symlink if it exists if os.path.exists('/usr/bin/php'): os.remove('/usr/bin/php') - # Create symlink to PHP 8.3 + # Create symlink to PHP 8.3 (default) command = 'ln -s /usr/local/lsws/lsphp83/bin/php /usr/bin/php' preFlightsChecks.call(command, self.distro, command, command, 1, 0, os.EX_OSERR) diff --git a/install/install_utils.py b/install/install_utils.py index 336eb732e..a97eb708f 100644 --- a/install/install_utils.py +++ b/install/install_utils.py @@ -34,6 +34,8 @@ 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-100' else: return -1 @@ -204,8 +206,8 @@ def get_distro(): if data.find('CentOS Linux release 8') > -1: return cent8 - ## if almalinux 9 then pretty much same as cent8 - if data.find('AlmaLinux release 8') > -1 or data.find('AlmaLinux release 9') > -1: + ## if almalinux 9 or 10 then pretty much same as cent8 + if data.find('AlmaLinux release 8') > -1 or data.find('AlmaLinux release 9') > -1 or data.find('AlmaLinux release 10') > -1: return cent8 if data.find('Rocky Linux release 8') > -1 or data.find('Rocky Linux 8') > -1 or data.find('rocky:8') > -1: return cent8 diff --git a/install/litespeed/httpd_config.xml b/install/litespeed/httpd_config.xml index 511966eda..3d54c7bb5 100644 --- a/install/litespeed/httpd_config.xml +++ b/install/litespeed/httpd_config.xml @@ -434,6 +434,66 @@ 400 500 + + lsapi + lsphp83 +
uds://tmp/lshttpd/lsphp83.sock
+ 35 + PHP_LSAPI_CHILDREN=35 + 60 + 0 + 1 + 0 + 3 + $SERVER_ROOT/lsphp83/bin/lsphp + 100 + 1 + 0 + 2047M + 2047M + 400 + 500 + + + lsapi + lsphp84 +
uds://tmp/lshttpd/lsphp84.sock
+ 35 + PHP_LSAPI_CHILDREN=35 + 60 + 0 + 1 + 0 + 3 + $SERVER_ROOT/lsphp84/bin/lsphp + 100 + 1 + 0 + 2047M + 2047M + 400 + 500 + + + lsapi + lsphp85 +
uds://tmp/lshttpd/lsphp85.sock
+ 35 + PHP_LSAPI_CHILDREN=35 + 60 + 0 + 1 + 0 + 3 + $SERVER_ROOT/lsphp85/bin/lsphp + 100 + 1 + 0 + 2047M + 2047M + 400 + 500 + @@ -506,6 +566,21 @@ lsapi lsphp82 + + php83 + lsapi + lsphp83 + + + php84 + lsapi + lsphp84 + + + php85 + lsapi + lsphp85 + diff --git a/managePHP/php82.xml b/managePHP/php82.xml new file mode 100644 index 000000000..a1a742918 --- /dev/null +++ b/managePHP/php82.xml @@ -0,0 +1,281 @@ + + + php82 + + + lsphp82-debuginfo + Debug information for package lsphp82 + 0 + + + + lsphp82-pecl-igbinary-debuginfo + Debug information for package lsphp82-pecl-igbinary + 0 + + + + lsphp82-pecl-mcrypt-debuginfo + lsphp82 lsphp82-pecl-mcrypt-debuginfo Extension + 0 + + + + lsphp82-bcmath + A extension for PHP applications for using the bcmath library. + 1 + + + + lsphp82-common + Common files for PHP. + 1 + + + + lsphp82-dba + A database abstraction layer extension for PHP applications. + 1 + + + + lsphp82-devel + Files needed for building PHP extensions. + 0 + + + + lsphp82-enchant + Enchant spelling extension for PHP applications. + 1 + + + + lsphp82-gd + A dynamic image creation extension for PHP applications. + 1 + + + + lsphp82-gmp + A extension for PHP applications for using the GNU Multiple Precision Arithmetic Library. + 1 + + + + lsphp82-imap + IMAP extension for PHP applications. + 1 + + + + lsphp82-intl + Internationalization extension for PHP applications. + 1 + + + + lsphp82-json + lsphp82 Json PHP Extension + 1 + + + + lsphp82-ldap + LDAP extension for PHP applications. + 1 + + + + lsphp82-mbstring + Multibyte string extension for PHP applications. + 1 + + + + lsphp82-mysqlnd + MySQL Native Driver for PHP applications. + 1 + + + + lsphp82-odbc + ODBC extension for PHP applications. + 1 + + + + lsphp82-opcache + OPcache extension for PHP applications. + 1 + + + + lsphp82-pdo + PHP Data Objects extension for PHP applications. + 1 + + + + lsphp82-pear + PHP Extension and Application Repository. + 1 + + + + lsphp82-pecl-apcu + APCu - APC User Cache extension for PHP applications. + 1 + + + + lsphp82-pecl-apcu-devel + Development files for APCu - APC User Cache extension for PHP applications. + 0 + + + + lsphp82-pecl-apcu-panel + APCu - APC User Cache extension for PHP applications. + 0 + + + + lsphp82-pecl-igbinary + Igbinary extension for PHP applications. + 1 + + + + lsphp82-pecl-igbinary-devel + Development files for Igbinary extension for PHP applications. + 0 + + + + lsphp82-pecl-mcrypt + lsphp82 lsphp82-pecl-mcrypt Extension. + 1 + + + + lsphp82-pecl-memcache + Memcache extension for PHP applications. + 1 + + + + lsphp82-pecl-memcached + Memcached extension for PHP applications. + 1 + + + + lsphp82-pecl-msgpack + MessagePack extension for PHP applications. + 1 + + + + lsphp82-pecl-msgpack-devel + Development files for MessagePack extension for PHP applications. + 0 + + + + lsphp82-pecl-redis + Redis extension for PHP applications. + 1 + + + + lsphp82-pgsql + PostgreSQL extension for PHP applications. + 1 + + + + lsphp82-process + Process control extension for PHP applications. + 1 + + + + lsphp82-pspell + PSpell extension for PHP applications. + 1 + + + + lsphp82-recode + Recode extension for PHP applications. + 1 + + + + lsphp82-snmp + SNMP extension for PHP applications. + 1 + + + + lsphp82-soap + SOAP extension for PHP applications. + 1 + + + + lsphp82-tidy + Tidy extension for PHP applications. + 1 + + + + lsphp82-xml + XML extension for PHP applications. + 1 + + + + lsphp82-xmlrpc + XML-RPC extension for PHP applications. + 1 + + + + lsphp82-zip + ZIP extension for PHP applications. + 1 + + + + lsphp82-mcrypt + Mcrypt extension for PHP applications. + 1 + + + + lsphp82-dbg + php82-dbg lsphp82-package + 0 + + + + lsphp82-ioncube + IonCube Loader extension for PHP applications. + 1 + + + + lsphp82-pecl-imagick + ImageMagick extension for PHP applications. + 1 + + + + lsphp82-sodium + Sodium extension for PHP applications. + 1 + + + diff --git a/managePHP/php83.xml b/managePHP/php83.xml new file mode 100644 index 000000000..19b101eab --- /dev/null +++ b/managePHP/php83.xml @@ -0,0 +1,281 @@ + + + php83 + + + lsphp83-debuginfo + Debug information for package lsphp83 + 0 + + + + lsphp83-pecl-igbinary-debuginfo + Debug information for package lsphp83-pecl-igbinary + 0 + + + + lsphp83-pecl-mcrypt-debuginfo + lsphp83 lsphp83-pecl-mcrypt-debuginfo Extension + 0 + + + + lsphp83-bcmath + A extension for PHP applications for using the bcmath library. + 1 + + + + lsphp83-common + Common files for PHP. + 1 + + + + lsphp83-dba + A database abstraction layer extension for PHP applications. + 1 + + + + lsphp83-devel + Files needed for building PHP extensions. + 0 + + + + lsphp83-enchant + Enchant spelling extension for PHP applications. + 1 + + + + lsphp83-gd + A dynamic image creation extension for PHP applications. + 1 + + + + lsphp83-gmp + A extension for PHP applications for using the GNU Multiple Precision Arithmetic Library. + 1 + + + + lsphp83-imap + IMAP extension for PHP applications. + 1 + + + + lsphp83-intl + Internationalization extension for PHP applications. + 1 + + + + lsphp83-json + lsphp83 Json PHP Extension + 1 + + + + lsphp83-ldap + LDAP extension for PHP applications. + 1 + + + + lsphp83-mbstring + Multibyte string extension for PHP applications. + 1 + + + + lsphp83-mysqlnd + MySQL Native Driver for PHP applications. + 1 + + + + lsphp83-odbc + ODBC extension for PHP applications. + 1 + + + + lsphp83-opcache + OPcache extension for PHP applications. + 1 + + + + lsphp83-pdo + PHP Data Objects extension for PHP applications. + 1 + + + + lsphp83-pear + PHP Extension and Application Repository. + 1 + + + + lsphp83-pecl-apcu + APCu - APC User Cache extension for PHP applications. + 1 + + + + lsphp83-pecl-apcu-devel + Development files for APCu - APC User Cache extension for PHP applications. + 0 + + + + lsphp83-pecl-apcu-panel + APCu - APC User Cache extension for PHP applications. + 0 + + + + lsphp83-pecl-igbinary + Igbinary extension for PHP applications. + 1 + + + + lsphp83-pecl-igbinary-devel + Development files for Igbinary extension for PHP applications. + 0 + + + + lsphp83-pecl-mcrypt + lsphp83 lsphp83-pecl-mcrypt Extension. + 1 + + + + lsphp83-pecl-memcache + Memcache extension for PHP applications. + 1 + + + + lsphp83-pecl-memcached + Memcached extension for PHP applications. + 1 + + + + lsphp83-pecl-msgpack + MessagePack extension for PHP applications. + 1 + + + + lsphp83-pecl-msgpack-devel + Development files for MessagePack extension for PHP applications. + 0 + + + + lsphp83-pecl-redis + Redis extension for PHP applications. + 1 + + + + lsphp83-pgsql + PostgreSQL extension for PHP applications. + 1 + + + + lsphp83-process + Process control extension for PHP applications. + 1 + + + + lsphp83-pspell + PSpell extension for PHP applications. + 1 + + + + lsphp83-recode + Recode extension for PHP applications. + 1 + + + + lsphp83-snmp + SNMP extension for PHP applications. + 1 + + + + lsphp83-soap + SOAP extension for PHP applications. + 1 + + + + lsphp83-tidy + Tidy extension for PHP applications. + 1 + + + + lsphp83-xml + XML extension for PHP applications. + 1 + + + + lsphp83-xmlrpc + XML-RPC extension for PHP applications. + 1 + + + + lsphp83-zip + ZIP extension for PHP applications. + 1 + + + + lsphp83-mcrypt + Mcrypt extension for PHP applications. + 1 + + + + lsphp83-dbg + php83-dbg lsphp83-package + 0 + + + + lsphp83-ioncube + IonCube Loader extension for PHP applications. + 1 + + + + lsphp83-pecl-imagick + ImageMagick extension for PHP applications. + 1 + + + + lsphp83-sodium + Sodium extension for PHP applications. + 1 + + + diff --git a/managePHP/php84.xml b/managePHP/php84.xml new file mode 100644 index 000000000..aaf44c9c0 --- /dev/null +++ b/managePHP/php84.xml @@ -0,0 +1,281 @@ + + + php84 + + + lsphp84-debuginfo + Debug information for package lsphp84 + 0 + + + + lsphp84-pecl-igbinary-debuginfo + Debug information for package lsphp84-pecl-igbinary + 0 + + + + lsphp84-pecl-mcrypt-debuginfo + lsphp84 lsphp84-pecl-mcrypt-debuginfo Extension + 0 + + + + lsphp84-bcmath + A extension for PHP applications for using the bcmath library. + 1 + + + + lsphp84-common + Common files for PHP. + 1 + + + + lsphp84-dba + A database abstraction layer extension for PHP applications. + 1 + + + + lsphp84-devel + Files needed for building PHP extensions. + 0 + + + + lsphp84-enchant + Enchant spelling extension for PHP applications. + 1 + + + + lsphp84-gd + A dynamic image creation extension for PHP applications. + 1 + + + + lsphp84-gmp + A extension for PHP applications for using the GNU Multiple Precision Arithmetic Library. + 1 + + + + lsphp84-imap + IMAP extension for PHP applications. + 1 + + + + lsphp84-intl + Internationalization extension for PHP applications. + 1 + + + + lsphp84-json + lsphp84 Json PHP Extension + 1 + + + + lsphp84-ldap + LDAP extension for PHP applications. + 1 + + + + lsphp84-mbstring + Multibyte string extension for PHP applications. + 1 + + + + lsphp84-mysqlnd + MySQL Native Driver for PHP applications. + 1 + + + + lsphp84-odbc + ODBC extension for PHP applications. + 1 + + + + lsphp84-opcache + OPcache extension for PHP applications. + 1 + + + + lsphp84-pdo + PHP Data Objects extension for PHP applications. + 1 + + + + lsphp84-pear + PHP Extension and Application Repository. + 1 + + + + lsphp84-pecl-apcu + APCu - APC User Cache extension for PHP applications. + 1 + + + + lsphp84-pecl-apcu-devel + Development files for APCu - APC User Cache extension for PHP applications. + 0 + + + + lsphp84-pecl-apcu-panel + APCu - APC User Cache extension for PHP applications. + 0 + + + + lsphp84-pecl-igbinary + Igbinary extension for PHP applications. + 1 + + + + lsphp84-pecl-igbinary-devel + Development files for Igbinary extension for PHP applications. + 0 + + + + lsphp84-pecl-mcrypt + lsphp84 lsphp84-pecl-mcrypt Extension. + 1 + + + + lsphp84-pecl-memcache + Memcache extension for PHP applications. + 1 + + + + lsphp84-pecl-memcached + Memcached extension for PHP applications. + 1 + + + + lsphp84-pecl-msgpack + MessagePack extension for PHP applications. + 1 + + + + lsphp84-pecl-msgpack-devel + Development files for MessagePack extension for PHP applications. + 0 + + + + lsphp84-pecl-redis + Redis extension for PHP applications. + 1 + + + + lsphp84-pgsql + PostgreSQL extension for PHP applications. + 1 + + + + lsphp84-process + Process control extension for PHP applications. + 1 + + + + lsphp84-pspell + PSpell extension for PHP applications. + 1 + + + + lsphp84-recode + Recode extension for PHP applications. + 1 + + + + lsphp84-snmp + SNMP extension for PHP applications. + 1 + + + + lsphp84-soap + SOAP extension for PHP applications. + 1 + + + + lsphp84-tidy + Tidy extension for PHP applications. + 1 + + + + lsphp84-xml + XML extension for PHP applications. + 1 + + + + lsphp84-xmlrpc + XML-RPC extension for PHP applications. + 1 + + + + lsphp84-zip + ZIP extension for PHP applications. + 1 + + + + lsphp84-mcrypt + Mcrypt extension for PHP applications. + 1 + + + + lsphp84-dbg + php84-dbg lsphp84-package + 0 + + + + lsphp84-ioncube + IonCube Loader extension for PHP applications. + 1 + + + + lsphp84-pecl-imagick + ImageMagick extension for PHP applications. + 1 + + + + lsphp84-sodium + Sodium extension for PHP applications. + 1 + + + diff --git a/managePHP/php85.xml b/managePHP/php85.xml new file mode 100644 index 000000000..62c270bad --- /dev/null +++ b/managePHP/php85.xml @@ -0,0 +1,281 @@ + + + php85 + + + lsphp85-debuginfo + Debug information for package lsphp85 + 0 + + + + lsphp85-pecl-igbinary-debuginfo + Debug information for package lsphp85-pecl-igbinary + 0 + + + + lsphp85-pecl-mcrypt-debuginfo + lsphp85 lsphp85-pecl-mcrypt-debuginfo Extension + 0 + + + + lsphp85-bcmath + A extension for PHP applications for using the bcmath library. + 1 + + + + lsphp85-common + Common files for PHP. + 1 + + + + lsphp85-dba + A database abstraction layer extension for PHP applications. + 1 + + + + lsphp85-devel + Files needed for building PHP extensions. + 0 + + + + lsphp85-enchant + Enchant spelling extension for PHP applications. + 1 + + + + lsphp85-gd + A dynamic image creation extension for PHP applications. + 1 + + + + lsphp85-gmp + A extension for PHP applications for using the GNU Multiple Precision Arithmetic Library. + 1 + + + + lsphp85-imap + IMAP extension for PHP applications. + 1 + + + + lsphp85-intl + Internationalization extension for PHP applications. + 1 + + + + lsphp85-json + lsphp85 Json PHP Extension + 1 + + + + lsphp85-ldap + LDAP extension for PHP applications. + 1 + + + + lsphp85-mbstring + Multibyte string extension for PHP applications. + 1 + + + + lsphp85-mysqlnd + MySQL Native Driver for PHP applications. + 1 + + + + lsphp85-odbc + ODBC extension for PHP applications. + 1 + + + + lsphp85-opcache + OPcache extension for PHP applications. + 1 + + + + lsphp85-pdo + PHP Data Objects extension for PHP applications. + 1 + + + + lsphp85-pear + PHP Extension and Application Repository. + 1 + + + + lsphp85-pecl-apcu + APCu - APC User Cache extension for PHP applications. + 1 + + + + lsphp85-pecl-apcu-devel + Development files for APCu - APC User Cache extension for PHP applications. + 0 + + + + lsphp85-pecl-apcu-panel + APCu - APC User Cache extension for PHP applications. + 0 + + + + lsphp85-pecl-igbinary + Igbinary extension for PHP applications. + 1 + + + + lsphp85-pecl-igbinary-devel + Development files for Igbinary extension for PHP applications. + 0 + + + + lsphp85-pecl-mcrypt + lsphp85 lsphp85-pecl-mcrypt Extension. + 1 + + + + lsphp85-pecl-memcache + Memcache extension for PHP applications. + 1 + + + + lsphp85-pecl-memcached + Memcached extension for PHP applications. + 1 + + + + lsphp85-pecl-msgpack + MessagePack extension for PHP applications. + 1 + + + + lsphp85-pecl-msgpack-devel + Development files for MessagePack extension for PHP applications. + 0 + + + + lsphp85-pecl-redis + Redis extension for PHP applications. + 1 + + + + lsphp85-pgsql + PostgreSQL extension for PHP applications. + 1 + + + + lsphp85-process + Process control extension for PHP applications. + 1 + + + + lsphp85-pspell + PSpell extension for PHP applications. + 1 + + + + lsphp85-recode + Recode extension for PHP applications. + 1 + + + + lsphp85-snmp + SNMP extension for PHP applications. + 1 + + + + lsphp85-soap + SOAP extension for PHP applications. + 1 + + + + lsphp85-tidy + Tidy extension for PHP applications. + 1 + + + + lsphp85-xml + XML extension for PHP applications. + 1 + + + + lsphp85-xmlrpc + XML-RPC extension for PHP applications. + 1 + + + + lsphp85-zip + ZIP extension for PHP applications. + 1 + + + + lsphp85-mcrypt + Mcrypt extension for PHP applications. + 1 + + + + lsphp85-dbg + php85-dbg lsphp85-package + 0 + + + + lsphp85-ioncube + IonCube Loader extension for PHP applications. + 1 + + + + lsphp85-pecl-imagick + ImageMagick extension for PHP applications. + 1 + + + + lsphp85-sodium + Sodium extension for PHP applications. + 1 + + + diff --git a/managePHP/phpManager.py b/managePHP/phpManager.py index f87c24613..b5c8972c2 100644 --- a/managePHP/phpManager.py +++ b/managePHP/phpManager.py @@ -20,7 +20,7 @@ class PHPManager: # elif distro == ProcessUtilities.ubuntu20: # return ['PHP 7.2', 'PHP 7.3', 'PHP 7.4', 'PHP 8.0', 'PHP 8.1'] # else: - # return ['PHP 7.0', 'PHP 7.1', 'PHP 7.2', 'PHP 7.3', 'PHP 7.4', 'PHP 8.0', 'PHP 8.1'] + # return ['PHP 7.0', 'PHP 7.1', 'PHP 7.2', 'PHP 7.3', 'PHP 7.4', 'PHP 8.0', 'PHP 8.1', 'PHP 8.2', 'PHP 8.3', 'PHP 8.4', 'PHP 8.5'] try: @@ -55,7 +55,7 @@ class PHPManager: except BaseException as msg: from plogical.CyberCPLogFileWriter import CyberCPLogFileWriter as logging logging.writeToFile(f'Error while finding php versions on system: {str(msg)}') - return ['PHP 7.0', 'PHP 7.1', 'PHP 7.2', 'PHP 7.3', 'PHP 7.4', 'PHP 8.0', 'PHP 8.1'] + return ['PHP 7.0', 'PHP 7.1', 'PHP 7.2', 'PHP 7.3', 'PHP 7.4', 'PHP 8.0', 'PHP 8.1', 'PHP 8.2', 'PHP 8.3', 'PHP 8.4', 'PHP 8.5'] @staticmethod def findApachePHPVersions(): @@ -67,7 +67,7 @@ class PHPManager: # elif distro == ProcessUtilities.ubuntu20: # return ['PHP 7.2', 'PHP 7.3', 'PHP 7.4', 'PHP 8.0', 'PHP 8.1'] # else: - # return ['PHP 7.0', 'PHP 7.1', 'PHP 7.2', 'PHP 7.3', 'PHP 7.4', 'PHP 8.0', 'PHP 8.1'] + # return ['PHP 7.0', 'PHP 7.1', 'PHP 7.2', 'PHP 7.3', 'PHP 7.4', 'PHP 8.0', 'PHP 8.1', 'PHP 8.2', 'PHP 8.3', 'PHP 8.4', 'PHP 8.5'] try: @@ -127,7 +127,7 @@ class PHPManager: except BaseException as msg: from plogical.CyberCPLogFileWriter import CyberCPLogFileWriter as logging logging.writeToFile(f'Error while finding php versions on system: {str(msg)}') - return ['PHP 7.0', 'PHP 7.1', 'PHP 7.2', 'PHP 7.3', 'PHP 7.4', 'PHP 8.0', 'PHP 8.1'] + return ['PHP 7.0', 'PHP 7.1', 'PHP 7.2', 'PHP 7.3', 'PHP 7.4', 'PHP 8.0', 'PHP 8.1', 'PHP 8.2', 'PHP 8.3', 'PHP 8.4', 'PHP 8.5'] @staticmethod def getPHPString(phpVersion): diff --git a/managePHP/ubuntuphp82.xml b/managePHP/ubuntuphp82.xml new file mode 100644 index 000000000..7a379c911 --- /dev/null +++ b/managePHP/ubuntuphp82.xml @@ -0,0 +1,131 @@ + + + php82 + + + lsphp82-common + Most of what you need. + 1 + + + + lsphp82-curl + Curl (common web tools) required for PHP + 1 + + + + lsphp82-dbg + Debugging extension + 0 + + + + lsphp82-dev + Development features almost always required. + 1 + + + + lsphp82-imap + Email extensions for PHP. + 1 + + + + lsphp82-intl + Extensions for countries other than the U.S. + 1 + + + + lsphp82-json + PHP extensions for JavaScript Object Notation. + 1 + + + + lsphp82-ldap + PHP extensions for LDAP (directory access protocol) + 1 + + + + lsphp82-modules-source + Source code for PHP modules + 0 + + + + lsphp82-mysql + MySQL database extensions for PHP. + 1 + + + + lsphp82-opcache + OPcache extension for PHP applications. + 1 + + + + lsphp82-pgsql + PostgreSQL database extensions for PHP. + 1 + + + + lsphp82-pspell + Spell checking extensions for PHP. + 1 + + + + lsphp82-recode + Character set conversion extensions for PHP. + 1 + + + + lsphp82-snmp + SNMP extensions for PHP. + 1 + + + + lsphp82-sqlite3 + SQLite3 database extensions for PHP. + 1 + + + + lsphp82-sybase + Sybase database extensions for PHP. + 1 + + + + lsphp82-tidy + Tidy HTML extensions for PHP. + 1 + + + + lsphp82-ioncube + IonCube Loader extension for PHP applications. + 1 + + + + lsphp82-imagick + ImageMagick extension for PHP applications. + 1 + + + + lsphp82-sodium + Sodium extension for PHP applications. + 1 + + + diff --git a/managePHP/ubuntuphp83.xml b/managePHP/ubuntuphp83.xml new file mode 100644 index 000000000..aae81ad65 --- /dev/null +++ b/managePHP/ubuntuphp83.xml @@ -0,0 +1,131 @@ + + + php83 + + + lsphp83-common + Most of what you need. + 1 + + + + lsphp83-curl + Curl (common web tools) required for PHP + 1 + + + + lsphp83-dbg + Debugging extension + 0 + + + + lsphp83-dev + Development features almost always required. + 1 + + + + lsphp83-imap + Email extensions for PHP. + 1 + + + + lsphp83-intl + Extensions for countries other than the U.S. + 1 + + + + lsphp83-json + PHP extensions for JavaScript Object Notation. + 1 + + + + lsphp83-ldap + PHP extensions for LDAP (directory access protocol) + 1 + + + + lsphp83-modules-source + Source code for PHP modules + 0 + + + + lsphp83-mysql + MySQL database extensions for PHP. + 1 + + + + lsphp83-opcache + OPcache extension for PHP applications. + 1 + + + + lsphp83-pgsql + PostgreSQL database extensions for PHP. + 1 + + + + lsphp83-pspell + Spell checking extensions for PHP. + 1 + + + + lsphp83-recode + Character set conversion extensions for PHP. + 1 + + + + lsphp83-snmp + SNMP extensions for PHP. + 1 + + + + lsphp83-sqlite3 + SQLite3 database extensions for PHP. + 1 + + + + lsphp83-sybase + Sybase database extensions for PHP. + 1 + + + + lsphp83-tidy + Tidy HTML extensions for PHP. + 1 + + + + lsphp83-ioncube + IonCube Loader extension for PHP applications. + 1 + + + + lsphp83-imagick + ImageMagick extension for PHP applications. + 1 + + + + lsphp83-sodium + Sodium extension for PHP applications. + 1 + + + diff --git a/managePHP/ubuntuphp84.xml b/managePHP/ubuntuphp84.xml new file mode 100644 index 000000000..989ecce03 --- /dev/null +++ b/managePHP/ubuntuphp84.xml @@ -0,0 +1,131 @@ + + + php84 + + + lsphp84-common + Most of what you need. + 1 + + + + lsphp84-curl + Curl (common web tools) required for PHP + 1 + + + + lsphp84-dbg + Debugging extension + 0 + + + + lsphp84-dev + Development features almost always required. + 1 + + + + lsphp84-imap + Email extensions for PHP. + 1 + + + + lsphp84-intl + Extensions for countries other than the U.S. + 1 + + + + lsphp84-json + PHP extensions for JavaScript Object Notation. + 1 + + + + lsphp84-ldap + PHP extensions for LDAP (directory access protocol) + 1 + + + + lsphp84-modules-source + Source code for PHP modules + 0 + + + + lsphp84-mysql + MySQL database extensions for PHP. + 1 + + + + lsphp84-opcache + OPcache extension for PHP applications. + 1 + + + + lsphp84-pgsql + PostgreSQL database extensions for PHP. + 1 + + + + lsphp84-pspell + Spell checking extensions for PHP. + 1 + + + + lsphp84-recode + Character set conversion extensions for PHP. + 1 + + + + lsphp84-snmp + SNMP extensions for PHP. + 1 + + + + lsphp84-sqlite3 + SQLite3 database extensions for PHP. + 1 + + + + lsphp84-sybase + Sybase database extensions for PHP. + 1 + + + + lsphp84-tidy + Tidy HTML extensions for PHP. + 1 + + + + lsphp84-ioncube + IonCube Loader extension for PHP applications. + 1 + + + + lsphp84-imagick + ImageMagick extension for PHP applications. + 1 + + + + lsphp84-sodium + Sodium extension for PHP applications. + 1 + + + diff --git a/managePHP/ubuntuphp85.xml b/managePHP/ubuntuphp85.xml new file mode 100644 index 000000000..faf322e0b --- /dev/null +++ b/managePHP/ubuntuphp85.xml @@ -0,0 +1,131 @@ + + + php85 + + + lsphp85-common + Most of what you need. + 1 + + + + lsphp85-curl + Curl (common web tools) required for PHP + 1 + + + + lsphp85-dbg + Debugging extension + 0 + + + + lsphp85-dev + Development features almost always required. + 1 + + + + lsphp85-imap + Email extensions for PHP. + 1 + + + + lsphp85-intl + Extensions for countries other than the U.S. + 1 + + + + lsphp85-json + PHP extensions for JavaScript Object Notation. + 1 + + + + lsphp85-ldap + PHP extensions for LDAP (directory access protocol) + 1 + + + + lsphp85-modules-source + Source code for PHP modules + 0 + + + + lsphp85-mysql + MySQL database extensions for PHP. + 1 + + + + lsphp85-opcache + OPcache extension for PHP applications. + 1 + + + + lsphp85-pgsql + PostgreSQL database extensions for PHP. + 1 + + + + lsphp85-pspell + Spell checking extensions for PHP. + 1 + + + + lsphp85-recode + Character set conversion extensions for PHP. + 1 + + + + lsphp85-snmp + SNMP extensions for PHP. + 1 + + + + lsphp85-sqlite3 + SQLite3 database extensions for PHP. + 1 + + + + lsphp85-sybase + Sybase database extensions for PHP. + 1 + + + + lsphp85-tidy + Tidy HTML extensions for PHP. + 1 + + + + lsphp85-ioncube + IonCube Loader extension for PHP applications. + 1 + + + + lsphp85-imagick + ImageMagick extension for PHP applications. + 1 + + + + lsphp85-sodium + Sodium extension for PHP applications. + 1 + + + diff --git a/plogical/processUtilities.py b/plogical/processUtilities.py index 2e9746922..cd4c5fd01 100644 --- a/plogical/processUtilities.py +++ b/plogical/processUtilities.py @@ -194,8 +194,8 @@ class ProcessUtilities(multi.Thread): content = f.read() if any(x in content for x in ['CentOS Linux release 8', 'AlmaLinux release 8', 'Rocky Linux release 8', 'Rocky Linux release 9', 'AlmaLinux release 9', 'CloudLinux release 9', - 'CloudLinux release 8']): - if any(x in content for x in ['AlmaLinux release 9', 'Rocky Linux release 9']): + 'CloudLinux release 8', 'AlmaLinux release 10']): + if any(x in content for x in ['AlmaLinux release 9', 'Rocky Linux release 9', 'AlmaLinux release 10']): ProcessUtilities.alma9check = 1 return ProcessUtilities.cent8 diff --git a/plogical/upgrade.py b/plogical/upgrade.py index c7b149469..49221f4c9 100644 --- a/plogical/upgrade.py +++ b/plogical/upgrade.py @@ -3215,6 +3215,12 @@ echo $oConfig->Save() ? 'Done' : 'Error'; command = 'yum install lsphp83* -y' subprocess.call(command, shell=True) + command = 'yum install lsphp84* -y' + subprocess.call(command, shell=True) + + command = 'yum install lsphp85* -y' + subprocess.call(command, shell=True) + except: command = 'DEBIAN_FRONTEND=noninteractive apt-get -y install ' \ 'lsphp7? lsphp7?-common lsphp7?-curl lsphp7?-dev lsphp7?-imap lsphp7?-intl lsphp7?-json ' \ @@ -3234,6 +3240,12 @@ echo $oConfig->Save() ? 'Done' : 'Error'; command = 'DEBIAN_FRONTEND=noninteractive apt-get -y install lsphp83*' os.system(command) + command = 'DEBIAN_FRONTEND=noninteractive apt-get -y install lsphp84*' + os.system(command) + + command = 'DEBIAN_FRONTEND=noninteractive apt-get -y install lsphp85*' + os.system(command) + CentOSPath = '/etc/redhat-release' openEulerPath = '/etc/openEuler-release' diff --git a/tuning/templates/tuning/phpTuning.html b/tuning/templates/tuning/phpTuning.html index 3ee284ee6..a163976de 100644 --- a/tuning/templates/tuning/phpTuning.html +++ b/tuning/templates/tuning/phpTuning.html @@ -684,6 +684,9 @@ + + + {% endif %}