Skip to content
Snippets Groups Projects
Commit 7df25000 authored by Helmo's avatar Helmo
Browse files

Disable install_ispconfig_interface when no webserver is present

parent d489c029
No related branches found
No related tags found
1 merge request!1305Disable install_ispconfig_interface when no webserver is present
...@@ -361,9 +361,13 @@ if($conf['mysql']['master_slave_setup'] == 'y') { ...@@ -361,9 +361,13 @@ if($conf['mysql']['master_slave_setup'] == 'y') {
if($conf['apache']['installed'] == true){ if($conf['apache']['installed'] == true){
if(!is_file($conf['apache']['vhost_conf_dir'].'/ispconfig.vhost')) $inst->install_ispconfig_interface = false; 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; 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 //** Shall the services be reconfigured during update
$reconfigure_services_answer = $inst->simple_query('Reconfigure Services?', array('yes', 'no', 'selected'), 'yes','reconfigure_services'); $reconfigure_services_answer = $inst->simple_query('Reconfigure Services?', array('yes', 'no', 'selected'), 'yes','reconfigure_services');
......
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