Commit 6c9ed8a7 authored by Till Brehm's avatar Till Brehm
Browse files

Merge branch 'fix-updater-appsvhost-config' into 'stable-3.1'

Fix updater appsvhost config

closes ispconfig/ispconfig3#4177

See merge request !447
parents fca43922 bc55aadd
......@@ -287,6 +287,11 @@ checkDbHealth();
*/
updateDbAndIni();
//** read server config from db into $conf['server_config']
$tmp = $inst->db->queryOneRecord("SELECT config FROM ?? WHERE server_id = ?", $conf["mysql"]["database"] . '.server', $conf['server_id']);
$conf['server_config'] = ini_to_array(stripslashes($tmp['config']));
unset($tmp);
/*
* Reconfigure the permisson if needed
* (if this is done at client side, only this client is updated.
......@@ -428,19 +433,21 @@ if($reconfigure_services_answer == 'yes' || $reconfigure_services_answer == 'sel
$inst->configure_nginx();
}
//** Configure apps vhost
swriteln('Configuring Apps vhost');
$inst->configure_apps_vhost();
}
if ($conf['server_config']['web']['apps_vhost_enabled'] == 'y') {
//** Configure apps vhost
swriteln('Configuring Apps vhost');
$inst->configure_apps_vhost();
} else swriteln('Skipping config of Apps vhost');
}
//* Configure Jailkit
if($inst->reconfigure_app('Jailkit', $reconfigure_services_answer)) {
swriteln('Configuring Jailkit');
$inst->configure_jailkit();
}
//* Configure Jailkit
if($inst->reconfigure_app('Jailkit', $reconfigure_services_answer)) {
swriteln('Configuring Jailkit');
$inst->configure_jailkit();
}
}
if($conf['services']['xmpp'] && $inst->reconfigure_app('XMPP', $reconfigure_services_answer)) {
//** Configure Metronome XMPP
$inst->configure_xmpp('dont-create-certs');
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment