Commit 0e7bd084 authored by Marius Burkard's avatar Marius Burkard
Browse files

- enable php 8.0

parent 73740bd3
...@@ -38,14 +38,14 @@ class ISPConfigDebian10OS extends ISPConfigDebianOS { ...@@ -38,14 +38,14 @@ class ISPConfigDebian10OS extends ISPConfigDebianOS {
$packages[] = 'unrar-free'; $packages[] = 'unrar-free';
$packages[] = 'lrzip'; $packages[] = 'lrzip';
} elseif($section === 'base') { } elseif($section === 'base') {
$packages[] = 'jailkit'; //$packages[] = 'jailkit';
} }
return $packages; return $packages;
} }
protected function shallCompileJailkit() { protected function shallCompileJailkit() {
return false; return true;
} }
protected function setDefaultPHP() { protected function setDefaultPHP() {
......
...@@ -244,7 +244,11 @@ class ISPConfigDebianOS extends ISPConfigBaseOS { ...@@ -244,7 +244,11 @@ class ISPConfigDebianOS extends ISPConfigBaseOS {
'/etc/php/7.4/cgi/php.ini', '/etc/php/7.4/cgi/php.ini',
'/etc/php/7.4/cli/php.ini', '/etc/php/7.4/cli/php.ini',
'/etc/php/7.4/fpm/php.ini', '/etc/php/7.4/fpm/php.ini',
'/etc/php/7.4/apache2/php.ini' '/etc/php/7.4/apache2/php.ini',
'/etc/php/8.0/cgi/php.ini',
'/etc/php/8.0/cli/php.ini',
'/etc/php/8.0/fpm/php.ini',
'/etc/php/8.0/apache2/php.ini'
); );
$replace = array( $replace = array(
...@@ -801,7 +805,8 @@ mailman-unsubscribe: "|/var/lib/mailman/mail/mailman unsubscribe mailman"'; ...@@ -801,7 +805,8 @@ mailman-unsubscribe: "|/var/lib/mailman/mail/mailman unsubscribe mailman"';
'7.1', '7.1',
'7.2', '7.2',
'7.3', '7.3',
'7.4' '7.4',
'8.0'
); );
} }
...@@ -836,8 +841,9 @@ mailman-unsubscribe: "|/var/lib/mailman/mail/mailman unsubscribe mailman"'; ...@@ -836,8 +841,9 @@ mailman-unsubscribe: "|/var/lib/mailman/mail/mailman unsubscribe mailman"';
foreach($php_modules as $curmod) { foreach($php_modules as $curmod) {
if(version_compare($curver, '7.2', '>=') && in_array($curmod, array('mcrypt'), true)) { if(version_compare($curver, '7.2', '>=') && in_array($curmod, array('mcrypt'), true)) {
continue; continue;
} } elseif(version_compare($curver, '7.4', '>=') && in_array($curmod, array('mcrypt', 'recode'), true)) {
if(version_compare($curver, '7.4', '>=') && in_array($curmod, array('recode'), true)) { continue;
} elseif(version_compare($curver, '8.0', '>=') && in_array($curmod, array('mcrypt', 'recode', 'json', 'xmlrpc'), true)) {
continue; continue;
} }
$packages[] = 'php' . $curver . '-' . $curmod; $packages[] = 'php' . $curver . '-' . $curmod;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment