diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2018-02-07 11:40:35 +0100 |
|---|---|---|
| committer | Morris Jobke <hey@morrisjobke.de> | 2018-02-07 11:40:35 +0100 |
| commit | 4ee539fde8a7bb3b78e14a5f3aa94e9fbc0047d7 (patch) | |
| tree | be4816e2ebab7bff88d49c2b8ec38830e247bdff /lib/private/Setup.php | |
| parent | 8d57d6884613078287601a49c30d0f0f0ced5a6a (diff) | |
| download | nextcloud-server-4ee539fde8a7bb3b78e14a5f3aa94e9fbc0047d7.tar.gz nextcloud-server-4ee539fde8a7bb3b78e14a5f3aa94e9fbc0047d7.zip | |
Fix proper overwrite URL on CLI install
* regression from #7835
Steps
* having a my.config.php with a proper `overwrite.cli.url` and `htaccess.RewriteBase` set
* install with this
* before: short URLs where broken and you need to call `occ maintenance:update:htaccess` additionally to fix this
* after: occ install results in a proper htaccess like on stable13
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
Diffstat (limited to 'lib/private/Setup.php')
| -rw-r--r-- | lib/private/Setup.php | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/lib/private/Setup.php b/lib/private/Setup.php index c0246a83e46..212deeeba0f 100644 --- a/lib/private/Setup.php +++ b/lib/private/Setup.php @@ -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); |