summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJulius Härtl <jus@bitgrid.net>2022-09-20 08:39:25 +0200
committerJulius Härtl <jus@bitgrid.net>2022-09-20 08:39:25 +0200
commitb427ccd065e01330b693fd13a1247945021ce588 (patch)
tree0022f9dccd973eb0e8c0a799c429d6fa22d8e7c8
parent3ac720aaca1cde1ea8bac8216d27f389804f328a (diff)
downloadnextcloud-server-b427ccd065e01330b693fd13a1247945021ce588.tar.gz
nextcloud-server-b427ccd065e01330b693fd13a1247945021ce588.zip
Do not store generated mysql password if it was not used
Signed-off-by: Julius Härtl <jus@bitgrid.net>
-rw-r--r--lib/private/Setup/MySQL.php3
1 files changed, 3 insertions, 0 deletions
diff --git a/lib/private/Setup/MySQL.php b/lib/private/Setup/MySQL.php
index e3004c269bc..caa73edccec 100644
--- a/lib/private/Setup/MySQL.php
+++ b/lib/private/Setup/MySQL.php
@@ -183,6 +183,9 @@ class MySQL extends AbstractDatabase {
$i++;
}
}
+ } else {
+ // Reuse existing password if a database config is already present
+ $this->dbPassword = $rootPassword;
}
} catch (\Exception $ex) {
$this->logger->info('Can not create a new MySQL user, will continue with the provided user.', [