Commit 63e4afa2 authored by Till Brehm's avatar Till Brehm
Browse files

Merge branch 'updater-interactive-service-config' into 'stable-3.1'

added request for DB Server on update

Please review this as I don't know if there was any incompatible reason why db was always enabled hard coded or if it's just as it would have been detected anyways as it's always on a ISPC-Server.

If you and ISPC are fine with probably getting a value `$conf['services']['db']` which is `false` on user behalf, then just merge without any further request.

Merging this really and ultimately fixes ispconfig/ispconfig3#4050

See merge request !437
parents 51bdf71e 83fbc5af
......@@ -313,8 +313,7 @@ $conf['services']['web'] = check_service_config_state('web_server', ($conf['apac
$conf['services']['xmpp'] = check_service_config_state('xmpp_server', $conf['xmpp']['installed']);
$conf['services']['firewall'] = check_service_config_state('firewall_server', ($conf['ufw']['installed'] || $conf['firewall']['installed']));
$conf['services']['vserver'] = check_service_config_state('vserver_server', $conf['services']['vserver']);
//** vv is this intended??? If you want to check adapt the lines above... vv
$conf['services']['db'] = true;
$conf['services']['db'] = check_service_config_state('db_server', true); /* Will always offer as MySQL is of course installed on this host as it's a requirement for ISPC to work... */
unset($current_svc_config);
......
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