From bf3966c43e4510a1316e1958ccb3d2e75aa95313 Mon Sep 17 00:00:00 2001 From: Thom Date: Sun, 5 May 2024 14:06:13 +0200 Subject: [PATCH 1/5] Add version 24.04 to supported Ubuntu versions --- lib/os/class.ISPConfigBaseOS.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/os/class.ISPConfigBaseOS.inc.php b/lib/os/class.ISPConfigBaseOS.inc.php index b3a4827..facd9a2 100644 --- a/lib/os/class.ISPConfigBaseOS.inc.php +++ b/lib/os/class.ISPConfigBaseOS.inc.php @@ -38,7 +38,7 @@ class ISPConfigBaseOS { throw new ISPConfigOSException('Version ' . $os['VERSION_ID'] . ' is not supported for ' . $os['ID']); } } elseif($os['ID'] === 'ubuntu') { - if(!in_array($os['VERSION_ID'], array('18.04', '20.04', '22.04'))) { + if(!in_array($os['VERSION_ID'], array('18.04', '20.04', '22.04', '24.04'))) { throw new ISPConfigOSException('Version ' . $os['VERSION_ID'] . ' is not supported for ' . $os['ID']); } } else { -- GitLab From 55e9c1baa73587d0615326494076a8ec56299be8 Mon Sep 17 00:00:00 2001 From: Thom Date: Sun, 5 May 2024 14:07:05 +0200 Subject: [PATCH 2/5] Improve incompatible Mailman versions message --- lib/os/class.ISPConfigUbuntu2204OS.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/os/class.ISPConfigUbuntu2204OS.inc.php b/lib/os/class.ISPConfigUbuntu2204OS.inc.php index cb292bc..d3c0c50 100644 --- a/lib/os/class.ISPConfigUbuntu2204OS.inc.php +++ b/lib/os/class.ISPConfigUbuntu2204OS.inc.php @@ -76,7 +76,7 @@ deb http://security.ubuntu.com/ubuntu jammy-security multiverse } protected function installMailman($host_name) { - ISPConfigLog::info('ISPConfig does not yet support mailman3 and mailman2 is no longer available in Ubuntu 22.04.', true); + ISPConfigLog::info('ISPConfig does not yet support mailman3 and mailman2 is no longer available since Ubuntu 22.04.', true); return; } -- GitLab From e45876101823a388d4a0c42409b7e48b14780a7d Mon Sep 17 00:00:00 2001 From: Thom Date: Sun, 5 May 2024 14:07:23 +0200 Subject: [PATCH 3/5] Remove unneeded setDefaultPHP function --- lib/os/class.ISPConfigUbuntu2204OS.inc.php | 22 ---------------------- 1 file changed, 22 deletions(-) diff --git a/lib/os/class.ISPConfigUbuntu2204OS.inc.php b/lib/os/class.ISPConfigUbuntu2204OS.inc.php index d3c0c50..5f2abe9 100644 --- a/lib/os/class.ISPConfigUbuntu2204OS.inc.php +++ b/lib/os/class.ISPConfigUbuntu2204OS.inc.php @@ -39,28 +39,6 @@ deb http://security.ubuntu.com/ubuntu jammy-security multiverse return $packages; } - protected function setDefaultPHP() { - ISPConfigLog::info('Setting default system PHP version.', true); - $cmd = 'update-alternatives --set php /usr/bin/php8.1'; - $result = $this->exec($cmd); - if($result === false) { - throw new ISPConfigOSException('Command ' . $cmd . ' failed.'); - } - - if(ISPConfig::shallInstall('web')) { - // When --use-php-system is used, there is no alternative for php-fpm.sock. - if(ISPConfig::wantsPHP() === 'system') { - $cmd = 'update-alternatives --set php-cgi /usr/bin/php-cgi8.1'; - } else { - $cmd = 'update-alternatives --set php-cgi /usr/bin/php-cgi8.1 ; update-alternatives --set php-fpm.sock /run/php/php8.1-fpm.sock'; - } - $result = $this->exec($cmd); - if($result === false) { - throw new ISPConfigOSException('Command ' . $cmd . ' failed.'); - } - } - } - protected function getMySQLUserQueries($mysql_root_pw) { $escaped_pw = preg_replace('/[\'\\\\]/', '\\$1', $mysql_root_pw); $queries = array( -- GitLab From 01b8825975ab4824342326180fa8a21ac84e1e6d Mon Sep 17 00:00:00 2001 From: Thom Date: Sun, 5 May 2024 14:07:50 +0200 Subject: [PATCH 4/5] Add Ubuntu 24.04 class --- lib/os/class.ISPConfigUbuntu2404OS.inc.php | 32 ++++++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 lib/os/class.ISPConfigUbuntu2404OS.inc.php diff --git a/lib/os/class.ISPConfigUbuntu2404OS.inc.php b/lib/os/class.ISPConfigUbuntu2404OS.inc.php new file mode 100644 index 0000000..256d5e4 --- /dev/null +++ b/lib/os/class.ISPConfigUbuntu2404OS.inc.php @@ -0,0 +1,32 @@ + Date: Sun, 5 May 2024 21:50:03 +0200 Subject: [PATCH 5/5] Update supported distributions list --- README.md | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 7bb7e4b..03fa406 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,13 @@ ![alt text](https://www.ispconfig.org/wp-content/themes/ispconfig/images/ispconfig_logo.png "") \ [![pipeline status](https://git.ispconfig.org/ispconfig/ispconfig-autoinstaller/badges/master/pipeline.svg)](https://git.ispconfig.org/ispconfig/ispconfig-autoinstaller/commits/master) -This script configures your server (Ubuntu 18.04, Ubuntu 20.04, Debian 9, 10 and 11 currently) following the "perfect server tutorials" from howtoforge.com and installs ISPConfig 3.2. It currently supports the x86_64 (also known as AMD64) CPU architecture only while ARM is not supported. +This script configures your server following the "perfect server tutorials" from howtoforge.com and installs ISPConfig 3.2. It currently supports the x86_64 (also known as AMD64) CPU architecture only while ARM is not supported. + +## Supported distributions +- Ubuntu 18.04, 20.04, 22.04 and 24.04. +- Debian 9, 10, 11 and 12. + +A list of all supported distributions by ISPConfig itself can be found at https://www.ispconfig.org/. ## Using the script You can use the script with curl -- GitLab