diff --git a/install/lib/update.lib.php b/install/lib/update.lib.php index c865c9fa88b8bf67cbf3a041d842b87308d0cd6c..70fcbb7fb00f1466294ea4611ba4e1aabd6d9e11 100644 --- a/install/lib/update.lib.php +++ b/install/lib/update.lib.php @@ -434,7 +434,7 @@ function check_service_config_state($servicename, $detected_value) { $answer = $inst->simple_query('Service \''.$servicename.'\' '.($detected_value ? 'has been' : 'has not been').' detected ('.($current_state ? 'strongly recommended, currently enabled' : 'currently disabled').') do you want to '.($detected_value ? 'enable and configure' : 'disable').' it? ', array('yes', 'no'), ($current_state ? 'yes' : 'no'), 'svc_detect_change_'.$servicename); if ($answer == 'yes') return $detected_value; else { - if ($servicename == 'web_server') echo "\033[0;33mWARNING: If ISPConfig-Panel is installed on this Server we will configure the Web Server anyways but will not enable it in ISPConfig.\033[0m\n\n"; + if ($servicename == 'web_server') echo "\033[0;33mWARNING: If ISPConfig-Interface (Webfrontend) is installed on this Server we will configure the Web Server anyways but will not enable it in ISPConfig.\033[0m\n\n"; return $current_state; } } else return $current_state; diff --git a/install/update.php b/install/update.php index 0012b7ed86922ca57705138653e19e618fc402c9..ed5d79c09fb3a0b13f502d3fe077123a39f9c30f 100644 --- a/install/update.php +++ b/install/update.php @@ -518,7 +518,7 @@ if($reconfigure_services_answer == 'yes') { if($conf['dovecot']['installed'] == true && $conf['dovecot']['init_script'] != '') system($inst->getinitcommand($conf['dovecot']['init_script'], 'restart')); if($conf['mailman']['installed'] == true && $conf['mailman']['init_script'] != '') system('nohup '.$inst->getinitcommand($conf['mailman']['init_script'], 'restart').' >/dev/null 2>&1 &'); } - if($conf['services']['web']) { + if($conf['services']['web'] || $inst->install_ispconfig_interface) { if($conf['webserver']['server_type'] == 'apache' && $conf['apache']['init_script'] != '') system($inst->getinitcommand($conf['apache']['init_script'], 'restart')); //* Reload is enough for nginx if($conf['webserver']['server_type'] == 'nginx'){