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

Merge pull request #2525 from nextcloud/stable10-2521 

[stable10] Document updater channel & check for correct PHP version in updater
This commit is contained in:
Morris Jobke 2016-12-06 12:58:35 +01:00 committed by GitHub
parent fcb7a1e458 5fd960b370
commit a314d50367
3 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
config/config.sample.php
View File

@ -521,6 +521,17 @@ $CONFIG = array(
*/
'updater.server.url' => 'https://updates.nextcloud.com/updater_server/',
/**
* The channel that Nextcloud should use to look for updates
*
* Supported values:
* - ``daily``
* - ``beta`
* - ``stable``
* - ``production``
*/
'updater.release.channel' => 'stable',
/**
* Is Nextcloud connected to the Internet or running in a closed network?
*/

3
lib/private/Updater/VersionCheck.php
View File

@ -73,6 +73,9 @@ class VersionCheck {
$version['updatechannel'] = \OC_Util::getChannel();
$version['edition'] = \OC_Util::getEditionString();
$version['build'] = \OC_Util::getBuild();
$version['php_major'] = PHP_MAJOR_VERSION;
$version['php_minor'] = PHP_MINOR_VERSION;
$version['php_release'] = PHP_RELEASE_VERSION;
$versionString = implode('x', $version);
//fetch xml data from updater

2
tests/lib/Updater/VersionCheckTest.php
View File

@ -50,7 +50,7 @@ class VersionCheckTest extends \Test\TestCase {
* @return string
*/
private function buildUpdateUrl($baseUrl) {
return $baseUrl . '?version='.implode('x', Util::getVersion()).'xinstalledatxlastupdatedatx'.\OC_Util::getChannel().'x'.\OC_Util::getEditionString().'x';
return $baseUrl . '?version='.implode('x', Util::getVersion()).'xinstalledatxlastupdatedatx'.\OC_Util::getChannel().'x'.\OC_Util::getEditionString().'xx'.PHP_MAJOR_VERSION.'x'.PHP_MINOR_VERSION.'x'.PHP_RELEASE_VERSION;
}
public function testCheckInCache() {