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

Merge pull request #8219 from nextcloud/fix-overwrite-url-on-cli-install 

Fix proper overwrite URL on CLI install
This commit is contained in:
Morris Jobke 2018-02-27 13:49:39 +01:00 committed by GitHub
parent 7bc3c2e057 4ee539fde8
commit 640db3d5fe
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/private/Setup.php
View File

@ -325,15 +325,20 @@ class Setup {
$secret = $this->random->generate(48);
//write the config file
$this->config->setValues([
$newConfigValues = [
'passwordsalt' => $salt,
'secret' => $secret,
'trusted_domains' => $trustedDomains,
'datadirectory' => $dataDir,
'overwrite.cli.url' => $request->getServerProtocol() . '://' . $request->getInsecureServerHost() . \OC::$WEBROOT,
'dbtype' => $dbType,
'version' => implode('.', \OCP\Util::getVersion()),
]);
];
if ($this->config->getValue('overwrite.cli.url', null) === null) {
$newConfigValues['overwrite.cli.url'] = $request->getServerProtocol() . '://' . $request->getInsecureServerHost() . \OC::$WEBROOT;
}
$this->config->setValues($newConfigValues);
try {
$dbSetup->initialize($options);