Skip to content

Commit 63e4afa

Browse files
author
Till Brehm
committed
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
2 parents 51bdf71 + 83fbc5a commit 63e4afa

File tree

1 file changed

+1
-2
lines changed

1 file changed

+1
-2
lines changed

install/update.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -313,8 +313,7 @@
313313
$conf['services']['xmpp'] = check_service_config_state('xmpp_server', $conf['xmpp']['installed']);
314314
$conf['services']['firewall'] = check_service_config_state('firewall_server', ($conf['ufw']['installed'] || $conf['firewall']['installed']));
315315
$conf['services']['vserver'] = check_service_config_state('vserver_server', $conf['services']['vserver']);
316-
//** vv is this intended??? If you want to check adapt the lines above... vv
317-
$conf['services']['db'] = true;
316+
$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... */
318317
unset($current_svc_config);
319318

320319

0 commit comments

Comments
 (0)