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

Move certificate bundle into resources/config/

This commit is contained in:
Lukas Reschke 2015-09-08 12:09:11 +02:00
parent 498e8f712c
commit a8e8a9dfb9
4 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/private/http/client/client.php
View File

@ -62,7 +62,7 @@ class Client implements IClient {
$dataDir = $this->config->getSystemValue('datadirectory');
$this->client->setDefaultOption('verify', $dataDir.'/'.$this->certificateManager->getCertificateBundle());
} else {
$this->client->setDefaultOption('verify', \OC::$SERVERROOT . '/config/ca-bundle.crt');
$this->client->setDefaultOption('verify', \OC::$SERVERROOT . '/resources/config/ca-bundle.crt');
}
$this->client->setDefaultOption('headers/User-Agent', 'ownCloud Server Crawler');

2
lib/private/security/certificatemanager.php
View File

@ -110,7 +110,7 @@ class CertificateManager implements ICertificateManager {
}
// Append the default certificates
$defaultCertificates = file_get_contents(\OC::$SERVERROOT . '/config/ca-bundle.crt');
$defaultCertificates = file_get_contents(\OC::$SERVERROOT . '/resources/config/ca-bundle.crt');
fwrite($fh_certs, $defaultCertificates);
fclose($fh_certs);
}

7
lib/private/updater.php
View File

@ -279,13 +279,6 @@ class Updater extends BasicEmitter {
throw new \Exception($e->getMessage());
}
// FIXME: Some users do not upload the new ca-bundle.crt, let's catch this
// in the update. For a newer release we shall use an integrity check after
// the update.
if(!file_exists(\OC::$configDir .'/ca-bundle.crt')) {
throw new \Exception('Please upload the ca-bundle.crt file into the \'config\' directory.');
}
// create empty file in data dir, so we can later find
// out that this is indeed an ownCloud data directory
// (in case it didn't exist before)

0
config/ca-bundle.crt → resources/config/ca-bundle.crt
View File