Browse Source

Use the untrusted domain in the installer

tags/v8.1.0alpha1
Lukas Reschke 9 years ago
parent
commit
a666f804c7
1 changed files with 2 additions and 2 deletions
  1. 2
    2
      lib/private/setup.php

+ 2
- 2
lib/private/setup.php View File

&& is_array($options['trusted_domains'])) { && is_array($options['trusted_domains'])) {
$trustedDomains = $options['trusted_domains']; $trustedDomains = $options['trusted_domains'];
} else { } else {
$trustedDomains = [\OCP\Util::getServerHostName()];
$trustedDomains = [$request->getInsecureServerHost()];
} }


if (OC_Util::runningOnWindows()) { if (OC_Util::runningOnWindows()) {
'secret' => $secret, 'secret' => $secret,
'trusted_domains' => $trustedDomains, 'trusted_domains' => $trustedDomains,
'datadirectory' => $dataDir, 'datadirectory' => $dataDir,
'overwrite.cli.url' => $request->getServerProtocol() . '://' . $request->getServerHost() . OC::$WEBROOT,
'overwrite.cli.url' => $request->getServerProtocol() . '://' . $request->getInsecureServerHost() . OC::$WEBROOT,
'dbtype' => $dbType, 'dbtype' => $dbType,
'version' => implode('.', OC_Util::getVersion()), 'version' => implode('.', OC_Util::getVersion()),
]); ]);

Loading…
Cancel
Save