Skip to content

Commit fff8f7f

Browse files
author
Marius Burkard
committed
Merge branch '6290-detect-ispconfig-and-apps-port-by-file-existence' into 'develop'
Check if ISPConfig is configured with NGINX or with Apache instead of... Closes #6290 See merge request ispconfig/ispconfig3!1558
2 parents 7d56e50 + 8705975 commit fff8f7f

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
@@ -835,7 +835,7 @@ function is_installed($appname) {
835835

836836
function get_ispconfig_port_number() {
837837
global $conf;
838-
if($conf['nginx']['installed'] == true){
838+
if(is_file($conf['nginx']['vhost_conf_dir'].'/ispconfig.vhost')) {
839839
$ispconfig_vhost_file = $conf['nginx']['vhost_conf_dir'].'/ispconfig.vhost';
840840
$regex = '/listen (\d+)/';
841841
} else {
@@ -861,7 +861,7 @@ function get_ispconfig_port_number() {
861861

862862
function get_apps_vhost_port_number() {
863863
global $conf;
864-
if($conf['nginx']['installed'] == true){
864+
if(is_file($conf['nginx']['vhost_conf_dir'].'/apps.vhost')) {
865865
$ispconfig_vhost_file = $conf['nginx']['vhost_conf_dir'].'/apps.vhost';
866866
$regex = '/listen (\d+)/';
867867
} else {

0 commit comments

Comments
 (0)