Skip to content

Commit e678c93

Browse files
author
A. Täffner
committed
restart webserver when panel is installed regardless of users choice... Further sall text change
1 parent ef64cd3 commit e678c93

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

install/lib/update.lib.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -434,7 +434,7 @@ function check_service_config_state($servicename, $detected_value) {
434434
$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);
435435
if ($answer == 'yes') return $detected_value;
436436
else {
437-
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";
437+
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";
438438
return $current_state;
439439
}
440440
} else return $current_state;

install/update.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -518,7 +518,7 @@
518518
if($conf['dovecot']['installed'] == true && $conf['dovecot']['init_script'] != '') system($inst->getinitcommand($conf['dovecot']['init_script'], 'restart'));
519519
if($conf['mailman']['installed'] == true && $conf['mailman']['init_script'] != '') system('nohup '.$inst->getinitcommand($conf['mailman']['init_script'], 'restart').' >/dev/null 2>&1 &');
520520
}
521-
if($conf['services']['web']) {
521+
if($conf['services']['web'] || $inst->install_ispconfig_interface) {
522522
if($conf['webserver']['server_type'] == 'apache' && $conf['apache']['init_script'] != '') system($inst->getinitcommand($conf['apache']['init_script'], 'restart'));
523523
//* Reload is enough for nginx
524524
if($conf['webserver']['server_type'] == 'nginx'){

0 commit comments

Comments
 (0)