Skip to content
Commits on Source (12)
Hide whitespace changes
Inline Side-by-side
lib/class.ISPConfig.inc.php
View file @ 2661ccdf
...@@ -174,10 +174,30 @@ class ISPConfig { ...@@ -174,10 +174,30 @@ class ISPConfig {
} }
public static function wantsPHP() { public static function wantsPHP() {
// If a new version is added, the getApacheModulesToDisable function should be updated to disable the latest version (this part could be improved)
$available_php_versions = array(
'5.6',
'7.0',
'7.1',
'7.2',
'7.3',
'7.4',
'8.0'
);
if(isset($_GET['use-php']) && $_GET['use-php']) { if(isset($_GET['use-php']) && $_GET['use-php']) {
return $_GET['use-php']; if ($_GET['use-php'] === 'system') {
return $_GET['use-php'];
} else {
$use_php = explode(',',$_GET['use-php']);
$php_versions = array_intersect($use_php, $available_php_versions);
if(!empty($php_versions)) {
return $php_versions;
} else {
return false;
}
}
} else { } else {
return false; return $available_php_versions;
} }
} }
...@@ -224,9 +244,9 @@ Possible arguments are: ...@@ -224,9 +244,9 @@ Possible arguments are:
--use-nginx ->Use nginx webserver instead of apache2 --use-nginx ->Use nginx webserver instead of apache2
--use-amavis ->Use amavis instead of rspamd for mail filtering --use-amavis ->Use amavis instead of rspamd for mail filtering
--use-unbound ->Use unbound instead of bind9 for local resolving. Only allowed if --no-dns is set. --use-unbound ->Use unbound instead of bind9 for local resolving. Only allowed if --no-dns is set.
--use-php ->Use specific PHP version instead of installing multiple PHP, e.g. --use-php=7.3 (5.6, 7.0, 7.1, 7.2 and 7.3 available). --use-php ->Use specific PHP versions, comma separated, instead of installing multiple PHP, e.g. --use-php=7.4,8.0 (5.6, 7.0, 7.1, 7.2, 7.3, 7.4 and 8.0 available).
->--use-php=system disables the sury repository and just installs the system\'s default PHP version. ->--use-php=system disables the sury repository and just installs the system\'s default PHP version.
->CURRENTLY ONLY EITHER --use-php=system OR OMITTING THE ARGUMENT (use all versions) IS SUPPORTED! ->ommiting the argument (use all versions)
--use-ftp-ports ->This option sets the passive port range for pure-ftpd. You have to specify the port range separated by hyphen, e. g. --use-ftp-ports=40110-40210. --use-ftp-ports ->This option sets the passive port range for pure-ftpd. You have to specify the port range separated by hyphen, e. g. --use-ftp-ports=40110-40210.
->If not provided the passive port range will not be configured. ->If not provided the passive port range will not be configured.
--no-web ->Do not use ISPConfig on this server to manage webserver setting and don\'t install nginx/apache or pureftpd. This will also prevent installing an ISPConfig UI and implies --no-roundcube as well as --no-pma --no-web ->Do not use ISPConfig on this server to manage webserver setting and don\'t install nginx/apache or pureftpd. This will also prevent installing an ISPConfig UI and implies --no-roundcube as well as --no-pma
...@@ -279,7 +299,7 @@ Possible arguments are: ...@@ -279,7 +299,7 @@ Possible arguments are:
} elseif(isset($_GET['lang']) && !in_array($_GET['lang'], array('de', 'en'), true)) { } elseif(isset($_GET['lang']) && !in_array($_GET['lang'], array('de', 'en'), true)) {
self::printHelp(); self::printHelp();
exit; exit;
} elseif(isset($_GET['use-php']) && $_GET['use-php'] !== 'system') {//!in_array($_GET['use-php'], array('5.6', '7.0', '7.1', '7.2', '7.3', 'system'), true)) { } elseif(isset($_GET['use-php']) && !self::wantsPHP()) {
self::printHelp(); self::printHelp();
exit; exit;
} elseif(isset($_GET['use-ftp-ports']) && (!preg_match('/^([1-9][0-9]+)-([1-9][0-9]+)$/', $_GET['use-ftp-ports'], $pmatch) || intval($pmatch[1]) >= intval($pmatch[2]))) { } elseif(isset($_GET['use-ftp-ports']) && (!preg_match('/^([1-9][0-9]+)-([1-9][0-9]+)$/', $_GET['use-ftp-ports'], $pmatch) || intval($pmatch[1]) >= intval($pmatch[2]))) {
......
lib/os/class.ISPConfigDebian10OS.inc.php
View file @ 2661ccdf
...@@ -49,7 +49,7 @@ class ISPConfigDebian10OS extends ISPConfigDebianOS { ...@@ -49,7 +49,7 @@ class ISPConfigDebian10OS extends ISPConfigDebianOS {
} }
protected function setDefaultPHP() { protected function setDefaultPHP() {
ISPConfigLog::info('Settings default system php version.', true); ISPConfigLog::info('Setting default system php version.', true);
$cmd = 'update-alternatives --set php /usr/bin/php7.3'; $cmd = 'update-alternatives --set php /usr/bin/php7.3';
$result = $this->exec($cmd); $result = $this->exec($cmd);
if($result === false) { if($result === false) {
...@@ -57,7 +57,12 @@ class ISPConfigDebian10OS extends ISPConfigDebianOS { ...@@ -57,7 +57,12 @@ class ISPConfigDebian10OS extends ISPConfigDebianOS {
} }
if(ISPConfig::shallInstall('web')) { if(ISPConfig::shallInstall('web')) {
$cmd = 'update-alternatives --set php-cgi /usr/bin/php-cgi7.3 ; update-alternatives --set php-fpm.sock /run/php/php7.3-fpm.sock'; // 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-cgi7.3';
} else {
$cmd = 'update-alternatives --set php-cgi /usr/bin/php-cgi7.3 ; update-alternatives --set php-fpm.sock /run/php/php7.3-fpm.sock';
}
$result = $this->exec($cmd); $result = $this->exec($cmd);
if($result === false) { if($result === false) {
throw new ISPConfigOSException('Command ' . $cmd . ' failed.'); throw new ISPConfigOSException('Command ' . $cmd . ' failed.');
......
lib/os/class.ISPConfigDebianOS.inc.php
View file @ 2661ccdf
...@@ -102,8 +102,13 @@ class ISPConfigDebianOS extends ISPConfigBaseOS { ...@@ -102,8 +102,13 @@ class ISPConfigDebianOS extends ISPConfigBaseOS {
'resolvconf', 'resolvconf',
'clamav', 'clamav',
'clamav-daemon', 'clamav-daemon',
'clamav-docs',
'zip',
'unzip', 'unzip',
'bzip2', 'bzip2',
'xz-utils',
'lzip',
'rar',
'arj', 'arj',
'nomarch', 'nomarch',
'lzop', 'lzop',
...@@ -111,15 +116,12 @@ class ISPConfigDebianOS extends ISPConfigBaseOS { ...@@ -111,15 +116,12 @@ class ISPConfigDebianOS extends ISPConfigBaseOS {
'apt-listchanges', 'apt-listchanges',
'libnet-ldap-perl', 'libnet-ldap-perl',
'libauthen-sasl-perl', 'libauthen-sasl-perl',
'clamav-docs',
'daemon', 'daemon',
'libio-string-perl', 'libio-string-perl',
'libio-socket-ssl-perl', 'libio-socket-ssl-perl',
'libnet-ident-perl', 'libnet-ident-perl',
'zip',
'libnet-dns-perl', 'libnet-dns-perl',
'libdbd-mysql-perl', 'libdbd-mysql-perl'
'dnsutils'
); );
if(ISPConfig::shallInstall('local-dns')) { if(ISPConfig::shallInstall('local-dns')) {
...@@ -161,9 +163,7 @@ class ISPConfigDebianOS extends ISPConfigBaseOS { ...@@ -161,9 +163,7 @@ class ISPConfigDebianOS extends ISPConfigBaseOS {
$modules = array( $modules = array(
'mpm_prefork' 'mpm_prefork'
); );
if(ISPConfig::wantsPHP() !== 'system') {
array_unshift($modules, 'php8.0');
}
return $modules; return $modules;
} }
...@@ -174,7 +174,7 @@ class ISPConfigDebianOS extends ISPConfigBaseOS { ...@@ -174,7 +174,7 @@ class ISPConfigDebianOS extends ISPConfigBaseOS {
} }
protected function setDefaultPHP() { protected function setDefaultPHP() {
ISPConfigLog::info('Settings default system php version.', true); ISPConfigLog::info('Setting default system php version.', true);
$cmd = 'update-alternatives --set php /usr/bin/php7.0'; $cmd = 'update-alternatives --set php /usr/bin/php7.0';
$result = $this->exec($cmd); $result = $this->exec($cmd);
if($result === false) { if($result === false) {
...@@ -182,7 +182,12 @@ class ISPConfigDebianOS extends ISPConfigBaseOS { ...@@ -182,7 +182,12 @@ class ISPConfigDebianOS extends ISPConfigBaseOS {
} }
if(ISPConfig::shallInstall('web')) { if(ISPConfig::shallInstall('web')) {
$cmd = 'update-alternatives --set php-cgi /usr/bin/php-cgi7.0 ; update-alternatives --set php-fpm.sock /run/php/php7.0-fpm.sock'; // 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-cgi7.0';
} else {
$cmd = 'update-alternatives --set php-cgi /usr/bin/php-cgi7.0 ; update-alternatives --set php-fpm.sock /run/php/php7.0-fpm.sock';
}
$result = $this->exec($cmd); $result = $this->exec($cmd);
if($result === false) { if($result === false) {
throw new ISPConfigOSException('Command ' . $cmd . ' failed.'); throw new ISPConfigOSException('Command ' . $cmd . ' failed.');
...@@ -291,6 +296,15 @@ class ISPConfigDebianOS extends ISPConfigBaseOS { ...@@ -291,6 +296,15 @@ class ISPConfigDebianOS extends ISPConfigBaseOS {
} }
} }
protected function addGoAccessRepo() {
ISPConfigLog::info('Activating GoAccess repository.', true);
$cmd = 'echo "deb https://deb.goaccess.io/ $(lsb_release -cs) main" | sudo tee -a /etc/apt/sources.list.d/goaccess.list >/dev/null 2>&1 ; wget -O - https://deb.goaccess.io/gnugpg.key 2>&1 | sudo apt-key --keyring /etc/apt/trusted.gpg.d/goaccess.gpg add - 2>&1';
$result = $this->exec($cmd);
if($result === false) {
throw new ISPConfigOSException('Command ' . $cmd . ' failed.');
}
}
protected function shallCompileJailkit() { protected function shallCompileJailkit() {
return true; return true;
} }
...@@ -475,6 +489,10 @@ mailman-unsubscribe: "|/var/lib/mailman/mail/mailman unsubscribe mailman"'; ...@@ -475,6 +489,10 @@ mailman-unsubscribe: "|/var/lib/mailman/mail/mailman unsubscribe mailman"';
$this->addSuryRepo(); $this->addSuryRepo();
} }
if(ISPConfig::shallInstall('web')) {
$this->addGoAccessRepo();
}
$this->updatePackageList(); $this->updatePackageList();
ISPConfigLog::info('Updating packages (after enabling 3rd party repos).', true); ISPConfigLog::info('Updating packages (after enabling 3rd party repos).', true);
...@@ -808,16 +826,8 @@ mailman-unsubscribe: "|/var/lib/mailman/mail/mailman unsubscribe mailman"'; ...@@ -808,16 +826,8 @@ mailman-unsubscribe: "|/var/lib/mailman/mail/mailman unsubscribe mailman"';
if(ISPConfig::wantsPHP() === 'system') { if(ISPConfig::wantsPHP() === 'system') {
$php_versions = array($this->getSystemPHPVersion()); $php_versions = array($this->getSystemPHPVersion());
} else { } else {
// If a new version is added, the getApacheModulesToDisable function should be updated to disable the latest version (this part could be improved) //ISPConfig::run() validations prevent sending here null values
$php_versions = array( $php_versions = ISPConfig::wantsPHP();
'5.6',
'7.0',
'7.1',
'7.2',
'7.3',
'7.4',
'8.0'
);
} }
$php_modules = array( $php_modules = array(
...@@ -1013,7 +1023,8 @@ mailman-unsubscribe: "|/var/lib/mailman/mail/mailman unsubscribe mailman"'; ...@@ -1013,7 +1023,8 @@ mailman-unsubscribe: "|/var/lib/mailman/mail/mailman unsubscribe mailman"';
'pure-ftpd-common', 'pure-ftpd-common',
'pure-ftpd-mysql', 'pure-ftpd-mysql',
'webalizer', 'webalizer',
'awstats' 'awstats',
'goaccess'
); );
$this->installPackages($packages); $this->installPackages($packages);
......
lib/os/class.ISPConfigUbuntu2004OS.inc.php
View file @ 2661ccdf
...@@ -99,7 +99,7 @@ maxretry = 3'; ...@@ -99,7 +99,7 @@ maxretry = 3';
} }
protected function setDefaultPHP() { protected function setDefaultPHP() {
ISPConfigLog::info('Settings default system php version.', true); ISPConfigLog::info('Setting default system php version.', true);
$cmd = 'update-alternatives --set php /usr/bin/php7.4'; $cmd = 'update-alternatives --set php /usr/bin/php7.4';
$result = $this->exec($cmd); $result = $this->exec($cmd);
if($result === false) { if($result === false) {
...@@ -107,7 +107,12 @@ maxretry = 3'; ...@@ -107,7 +107,12 @@ maxretry = 3';
} }
if(ISPConfig::shallInstall('web')) { if(ISPConfig::shallInstall('web')) {
$cmd = 'update-alternatives --set php-cgi /usr/bin/php-cgi7.4 ; update-alternatives --set php-fpm.sock /run/php/php7.4-fpm.sock'; // 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-cgi7.4';
} else {
$cmd = 'update-alternatives --set php-cgi /usr/bin/php-cgi7.4 ; update-alternatives --set php-fpm.sock /run/php/php7.4-fpm.sock';
}
$result = $this->exec($cmd); $result = $this->exec($cmd);
if($result === false) { if($result === false) {
throw new ISPConfigOSException('Command ' . $cmd . ' failed.'); throw new ISPConfigOSException('Command ' . $cmd . ' failed.');
......
lib/os/class.ISPConfigUbuntuOS.inc.php
View file @ 2661ccdf
...@@ -82,7 +82,7 @@ maxretry = 3'; ...@@ -82,7 +82,7 @@ maxretry = 3';
} }
protected function setDefaultPHP() { protected function setDefaultPHP() {
ISPConfigLog::info('Settings default system php version.', true); ISPConfigLog::info('Setting default system php version.', true);
$cmd = 'update-alternatives --set php /usr/bin/php7.2'; $cmd = 'update-alternatives --set php /usr/bin/php7.2';
$result = $this->exec($cmd); $result = $this->exec($cmd);
if($result === false) { if($result === false) {
...@@ -90,7 +90,12 @@ maxretry = 3'; ...@@ -90,7 +90,12 @@ maxretry = 3';
} }
if(ISPConfig::shallInstall('web')) { if(ISPConfig::shallInstall('web')) {
$cmd = 'update-alternatives --set php-cgi /usr/bin/php-cgi7.2 ; update-alternatives --set php-fpm.sock /run/php/php7.2-fpm.sock'; // 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-cgi7.2';
} else {
$cmd = 'update-alternatives --set php-cgi /usr/bin/php-cgi7.2 ; update-alternatives --set php-fpm.sock /run/php/php7.2-fpm.sock';
}
$result = $this->exec($cmd); $result = $this->exec($cmd);
if($result === false) { if($result === false) {
throw new ISPConfigOSException('Command ' . $cmd . ' failed.'); throw new ISPConfigOSException('Command ' . $cmd . ' failed.');
......