Skip to content
Snippets Groups Projects
Commit fff8f7f4 authored by Marius Burkard's avatar Marius Burkard
Browse files

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
parents 7d56e50c 8705975b
No related branches found
No related tags found
1 merge request!1558Check if ISPConfig is configured with NGINX or with Apache instead of...
Pipeline #10627 passed
......@@ -835,7 +835,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 {
......@@ -861,7 +861,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 {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment