From 7df25000a373399d7b6cc4d0d0830cc57a906b46 Mon Sep 17 00:00:00 2001
From: Herman van Rink <rink@initfour.nl>
Date: Fri, 30 Oct 2020 20:47:50 +0100
Subject: [PATCH] Disable install_ispconfig_interface when no webserver is
present
---
install/update.php | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/install/update.php b/install/update.php
index c15678486f..4043647d8e 100644
--- a/install/update.php
+++ b/install/update.php
@@ -361,9 +361,13 @@ if($conf['mysql']['master_slave_setup'] == 'y') {
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');
--
GitLab