mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Correctly append the port to the host so it's written to the config correctly 

Signed-off-by: Joas Schilling <coding@schilljs.com>
This commit is contained in:
Joas Schilling 2020-02-05 12:47:08 +01:00 committed by John Molakvoæ (skjnldsv)
parent 6e892c0db6
commit 6cdc63ff69
No known key found for this signature in database
GPG Key ID: 60C25B8C072916CF
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
core/Command/Maintenance/Install.php
View File

@ -132,6 +132,10 @@ class Install extends Command {
} else { } else {
$dbHost = $input->getOption('database-host'); $dbHost = $input->getOption('database-host');
} }
if ($dbPort) {
// Append the port to the host so it is the same as in the config (there is no dbport config)
$dbHost .= ':' . $dbPort;
}
$dbTablePrefix = 'oc_'; $dbTablePrefix = 'oc_';
if ($input->hasParameterOption('--database-table-prefix')) { if ($input->hasParameterOption('--database-table-prefix')) {
$dbTablePrefix = (string) $input->getOption('database-table-prefix'); $dbTablePrefix = (string) $input->getOption('database-table-prefix');
@ -181,7 +185,6 @@ class Install extends Command {
'dbpass' => $dbPass, 'dbpass' => $dbPass,
'dbname' => $dbName, 'dbname' => $dbName,
'dbhost' => $dbHost, 'dbhost' => $dbHost,
'dbport' => $dbPort,
'dbtableprefix' => $dbTablePrefix, 'dbtableprefix' => $dbTablePrefix,
'adminlogin' => $adminLogin, 'adminlogin' => $adminLogin,
'adminpass' => $adminPassword, 'adminpass' => $adminPassword,