Merge branch 'patch-updater-detect-interface' into 'develop'

Marius Burkard · Marius Burkard · commit 1fd891dea681 · 2020-12-04T17:17:39.000+01:00
Disable install_ispconfig_interface when no webserver is present

See merge request ispconfig/ispconfig3!1305
diff --git a/install/update.php b/install/update.php
@@ -361,9 +361,13 @@
 if($conf['apache']['installed'] == true){
 	if(!is_file($conf['apache']['vhost_conf_dir'].'/ispconfig.vhost')) $inst->install_ispconfig_interface = false;
 }
-if($conf['nginx']['installed'] == true){
+elseif($conf['nginx']['installed'] == true){
 	if(!is_file($conf['nginx']['vhost_conf_dir'].'/ispconfig.vhost')) $inst->install_ispconfig_interface = false;
 }
+else {
+	// If neither webserver is installed then this can't be the server that hosts the ispconfig interface.
+	$inst->install_ispconfig_interface = false;
+}
 
 //** Shall the services be reconfigured during update
 $reconfigure_services_answer = $inst->simple_query('Reconfigure Services?', array('yes', 'no', 'selected'), 'yes','reconfigure_services');

Original file line number	Diff line number	Diff line change
`@@ -361,9 +361,13 @@`
`361`	`361`	`if($conf['apache']['installed'] == true){`
`362`	`362`	`if(!is_file($conf['apache']['vhost_conf_dir'].'/ispconfig.vhost')) $inst->install_ispconfig_interface = false;`
`363`	`363`	`}`
`364`		`-if($conf['nginx']['installed'] == true){`
	`364`	`+elseif($conf['nginx']['installed'] == true){`
`365`	`365`	`if(!is_file($conf['nginx']['vhost_conf_dir'].'/ispconfig.vhost')) $inst->install_ispconfig_interface = false;`
`366`	`366`	`}`
	`367`	`+else {`
	`368`	`+ // If neither webserver is installed then this can't be the server that hosts the ispconfig interface.`
	`369`	`+ $inst->install_ispconfig_interface = false;`
	`370`	`+}`
`367`	`371`
`368`	`372`	`//** Shall the services be reconfigured during update`
`369`	`373`	`$reconfigure_services_answer = $inst->simple_query('Reconfigure Services?', array('yes', 'no', 'selected'), 'yes','reconfigure_services');`