diff options
author | Joas Schilling <coding@schilljs.com> | 2016-09-08 13:28:32 +0300 |
---|---|---|
committer | Joas Schilling <coding@schilljs.com> | 2016-09-08 13:28:32 +0300 |
commit | 407198245432ce26fd0c2f7ae6ae23be6727600a (patch) | |
tree | 3000f002b077b9907044cfca8ee702edc32301a1 | |
parent | 997e4cf3fe297190c16ad12750e60c289c8ed088 (diff) |
Change updater URL
-rw-r--r-- | config/config.sample.php | 2 | ||||
-rw-r--r-- | lib/private/updater.php | 2 | ||||
-rw-r--r-- | tests/lib/updater.php | 24 |
3 files changed, 14 insertions, 14 deletions
diff --git a/config/config.sample.php b/config/config.sample.php index ca020113a36..538dd9d7a6e 100644 --- a/config/config.sample.php +++ b/config/config.sample.php @@ -498,7 +498,7 @@ $CONFIG = array( /** * URL that Nextcloud should use to look for updates */ -'updater.server.url' => 'https://updates.nextcloud.org/server/', +'updater.server.url' => 'https://updates.nextcloud.com/update-server/', /** * Release channel to use for updates diff --git a/lib/private/updater.php b/lib/private/updater.php index 58d5bec7cbf..2ebc332bd56 100644 --- a/lib/private/updater.php +++ b/lib/private/updater.php @@ -144,7 +144,7 @@ class Updater extends BasicEmitter { return json_decode($this->config->getAppValue('core', 'lastupdateResult'), true); } - $updaterUrl = $this->config->getSystemValue('updater.server.url', 'https://updates.nextcloud.org/server/'); + $updaterUrl = $this->config->getSystemValue('updater.server.url', 'https://updates.nextcloud.com/update-server/'); $this->config->setAppValue('core', 'lastupdatedat', time()); diff --git a/tests/lib/updater.php b/tests/lib/updater.php index 1363fb735ca..2ceb2604076 100644 --- a/tests/lib/updater.php +++ b/tests/lib/updater.php @@ -222,8 +222,8 @@ class UpdaterTest extends \Test\TestCase { $this->config ->expects($this->at(1)) ->method('getSystemValue') - ->with('updater.server.url', 'https://updates.nextcloud.org/server/') - ->willReturn('https://updates.nextcloud.org/server/'); + ->with('updater.server.url', 'https://updates.nextcloud.com/update-server/') + ->willReturn('https://updates.nextcloud.com/update-server/'); $this->config ->expects($this->at(2)) ->method('setAppValue') @@ -253,7 +253,7 @@ class UpdaterTest extends \Test\TestCase { $this->httpHelper ->expects($this->once()) ->method('getUrlContent') - ->with($this->buildUpdateUrl('https://updates.nextcloud.org/server/')) + ->with($this->buildUpdateUrl('https://updates.nextcloud.com/update-server/')) ->will($this->returnValue($updateXml)); $this->assertSame($expectedResult, $this->updater->check()); @@ -268,8 +268,8 @@ class UpdaterTest extends \Test\TestCase { $this->config ->expects($this->at(1)) ->method('getSystemValue') - ->with('updater.server.url', 'https://updates.nextcloud.org/server/') - ->willReturn('https://updates.nextcloud.org/server/'); + ->with('updater.server.url', 'https://updates.nextcloud.com/update-server/') + ->willReturn('https://updates.nextcloud.com/update-server/'); $this->config ->expects($this->at(2)) ->method('setAppValue') @@ -293,7 +293,7 @@ class UpdaterTest extends \Test\TestCase { $this->httpHelper ->expects($this->once()) ->method('getUrlContent') - ->with($this->buildUpdateUrl('https://updates.nextcloud.org/server/')) + ->with($this->buildUpdateUrl('https://updates.nextcloud.com/update-server/')) ->will($this->returnValue($updateXml)); $this->assertSame([], $this->updater->check()); @@ -315,8 +315,8 @@ class UpdaterTest extends \Test\TestCase { $this->config ->expects($this->at(1)) ->method('getSystemValue') - ->with('updater.server.url', 'https://updates.nextcloud.org/server/') - ->willReturn('https://updates.nextcloud.org/server/'); + ->with('updater.server.url', 'https://updates.nextcloud.com/update-server/') + ->willReturn('https://updates.nextcloud.com/update-server/'); $this->config ->expects($this->at(2)) ->method('setAppValue') @@ -342,7 +342,7 @@ class UpdaterTest extends \Test\TestCase { $this->httpHelper ->expects($this->once()) ->method('getUrlContent') - ->with($this->buildUpdateUrl('https://updates.nextcloud.org/server/')) + ->with($this->buildUpdateUrl('https://updates.nextcloud.com/update-server/')) ->will($this->returnValue($updateXml)); $this->assertSame($expectedResult, $this->updater->check()); @@ -359,8 +359,8 @@ class UpdaterTest extends \Test\TestCase { $this->config ->expects($this->at(1)) ->method('getSystemValue') - ->with('updater.server.url', 'https://updates.nextcloud.org/server/') - ->willReturn('https://updates.nextcloud.org/server/'); + ->with('updater.server.url', 'https://updates.nextcloud.com/update-server/') + ->willReturn('https://updates.nextcloud.com/update-server/'); $this->config ->expects($this->at(2)) ->method('setAppValue') @@ -384,7 +384,7 @@ class UpdaterTest extends \Test\TestCase { $this->httpHelper ->expects($this->once()) ->method('getUrlContent') - ->with($this->buildUpdateUrl('https://updates.nextcloud.org/server/')) + ->with($this->buildUpdateUrl('https://updates.nextcloud.com/update-server/')) ->will($this->returnValue($updateXml)); $this->assertSame($expectedResult, $this->updater->check()); |