Commit bc55aadd authored by A. Täffner's avatar A. Täffner
Browse files

added server ini config to $conf and corrected check for apps vhost enabled

parent c028f1b8
......@@ -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,7 +433,7 @@ if($reconfigure_services_answer == 'yes' || $reconfigure_services_answer == 'sel
$inst->configure_nginx();
}
if ($conf['web']['apps_vhost_enabled'] == 'y') {
if ($conf['server_config']['web']['apps_vhost_enabled'] == 'y') {
//** Configure apps vhost
swriteln('Configuring Apps vhost');
$inst->configure_apps_vhost();
......
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