Skip to content

Commit 8705975

Browse files
committed
Check if ISPConfig is configured with NGINX or with Apache instead of installed software (Fixes #26290)
1 parent 9954d8f commit 8705975

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

install/lib/install.lib.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -842,7 +842,7 @@ function is_installed($appname) {
842842

843843
function get_ispconfig_port_number() {
844844
global $conf;
845-
if($conf['nginx']['installed'] == true){
845+
if(is_file($conf['nginx']['vhost_conf_dir'].'/ispconfig.vhost')) {
846846
$ispconfig_vhost_file = $conf['nginx']['vhost_conf_dir'].'/ispconfig.vhost';
847847
$regex = '/listen (\d+)/';
848848
} else {
@@ -868,7 +868,7 @@ function get_ispconfig_port_number() {
868868

869869
function get_apps_vhost_port_number() {
870870
global $conf;
871-
if($conf['nginx']['installed'] == true){
871+
if(is_file($conf['nginx']['vhost_conf_dir'].'/apps.vhost')) {
872872
$ispconfig_vhost_file = $conf['nginx']['vhost_conf_dir'].'/apps.vhost';
873873
$regex = '/listen (\d+)/';
874874
} else {

0 commit comments

Comments
 (0)