From 8705975b7911ad6323356eb90bdc4be93e9a0356 Mon Sep 17 00:00:00 2001 From: Manoa Ratefiarison Date: Thu, 10 Feb 2022 19:12:30 +0000 Subject: [PATCH] Check if ISPConfig is configured with NGINX or with Apache instead of installed software (Fixes #26290) --- install/lib/install.lib.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/install/lib/install.lib.php b/install/lib/install.lib.php index 6ff32bb785..610123b1c6 100644 --- a/install/lib/install.lib.php +++ b/install/lib/install.lib.php @@ -842,7 +842,7 @@ function is_installed($appname) { function get_ispconfig_port_number() { global $conf; - if($conf['nginx']['installed'] == true){ + if(is_file($conf['nginx']['vhost_conf_dir'].'/ispconfig.vhost')) { $ispconfig_vhost_file = $conf['nginx']['vhost_conf_dir'].'/ispconfig.vhost'; $regex = '/listen (\d+)/'; } else { @@ -868,7 +868,7 @@ function get_ispconfig_port_number() { function get_apps_vhost_port_number() { global $conf; - if($conf['nginx']['installed'] == true){ + if(is_file($conf['nginx']['vhost_conf_dir'].'/apps.vhost')) { $ispconfig_vhost_file = $conf['nginx']['vhost_conf_dir'].'/apps.vhost'; $regex = '/listen (\d+)/'; } else { -- GitLab