From 28f39d679875ab8361659da7eec753203caa924a Mon Sep 17 00:00:00 2001
From: Thom Pol <>
Date: Tue, 23 Feb 2021 11:00:12 +0100
Subject: [PATCH] Only run update-alternatives for php-fpm.sock when multiple
 PHP version are installed (#30)

---
 lib/os/class.ISPConfigDebian10OS.inc.php   | 7 ++++++-
 lib/os/class.ISPConfigDebianOS.inc.php     | 7 ++++++-
 lib/os/class.ISPConfigUbuntu2004OS.inc.php | 7 ++++++-
 lib/os/class.ISPConfigUbuntuOS.inc.php     | 7 ++++++-
 4 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/lib/os/class.ISPConfigDebian10OS.inc.php b/lib/os/class.ISPConfigDebian10OS.inc.php
index 2c0d4a3..3320219 100644
--- a/lib/os/class.ISPConfigDebian10OS.inc.php
+++ b/lib/os/class.ISPConfigDebian10OS.inc.php
@@ -57,7 +57,12 @@ class ISPConfigDebian10OS extends ISPConfigDebianOS {
 		}
 
 		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);
 			if($result === false) {
 				throw new ISPConfigOSException('Command ' . $cmd . ' failed.');
diff --git a/lib/os/class.ISPConfigDebianOS.inc.php b/lib/os/class.ISPConfigDebianOS.inc.php
index ccaa6e9..7d8b53d 100644
--- a/lib/os/class.ISPConfigDebianOS.inc.php
+++ b/lib/os/class.ISPConfigDebianOS.inc.php
@@ -182,7 +182,12 @@ class ISPConfigDebianOS extends ISPConfigBaseOS {
 		}
 
 		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);
 			if($result === false) {
 				throw new ISPConfigOSException('Command ' . $cmd . ' failed.');
diff --git a/lib/os/class.ISPConfigUbuntu2004OS.inc.php b/lib/os/class.ISPConfigUbuntu2004OS.inc.php
index 8f1d91d..8d647fd 100644
--- a/lib/os/class.ISPConfigUbuntu2004OS.inc.php
+++ b/lib/os/class.ISPConfigUbuntu2004OS.inc.php
@@ -107,7 +107,12 @@ maxretry = 3';
 		}
 
 		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);
 			if($result === false) {
 				throw new ISPConfigOSException('Command ' . $cmd . ' failed.');
diff --git a/lib/os/class.ISPConfigUbuntuOS.inc.php b/lib/os/class.ISPConfigUbuntuOS.inc.php
index 51614b8..b40a462 100644
--- a/lib/os/class.ISPConfigUbuntuOS.inc.php
+++ b/lib/os/class.ISPConfigUbuntuOS.inc.php
@@ -90,7 +90,12 @@ maxretry = 3';
 		}
 
 		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);
 			if($result === false) {
 				throw new ISPConfigOSException('Command ' . $cmd . ' failed.');
-- 
GitLab