From eb7ed2356fa3b614c48a1afa2fb7449d1c8d1dc7 Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@owncloud.com>
Date: Sun, 12 Jun 2016 23:49:23 +0200
Subject: [PATCH] [stable9] Use custom updater URL

---
 config/config.sample.php |  2 +-
 lib/private/updater.php  |  2 +-
 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 27552512a8..4253517f24 100644
--- a/config/config.sample.php
+++ b/config/config.sample.php
@@ -499,7 +499,7 @@ $CONFIG = array(
 /**
  * URL that ownCloud should use to look for updates
  */
-'updater.server.url' => 'https://updates.owncloud.com/server/',
+'updater.server.url' => 'https://updates.nextcloud.org/server/',
 
 /**
  * Is ownCloud connected to the Internet or running in a closed network?
diff --git a/lib/private/updater.php b/lib/private/updater.php
index fc852991a1..f854afa20c 100644
--- a/lib/private/updater.php
+++ b/lib/private/updater.php
@@ -143,7 +143,7 @@ class Updater extends BasicEmitter {
 			return json_decode($this->config->getAppValue('core', 'lastupdateResult'), true);
 		}
 
-		$updaterUrl = $this->config->getSystemValue('updater.server.url', 'https://updates.owncloud.com/server/');
+		$updaterUrl = $this->config->getSystemValue('updater.server.url', 'https://updates.nextcloud.org/server/');
 
 		$this->config->setAppValue('core', 'lastupdatedat', time());
 
diff --git a/tests/lib/updater.php b/tests/lib/updater.php
index 4b6205a42c..1363fb735c 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.owncloud.com/server/')
-			->willReturn('https://updates.owncloud.com/server/');
+			->with('updater.server.url', 'https://updates.nextcloud.org/server/')
+			->willReturn('https://updates.nextcloud.org/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.owncloud.com/server/'))
+			->with($this->buildUpdateUrl('https://updates.nextcloud.org/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.owncloud.com/server/')
-			->willReturn('https://updates.owncloud.com/server/');
+			->with('updater.server.url', 'https://updates.nextcloud.org/server/')
+			->willReturn('https://updates.nextcloud.org/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.owncloud.com/server/'))
+			->with($this->buildUpdateUrl('https://updates.nextcloud.org/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.owncloud.com/server/')
-			->willReturn('https://updates.owncloud.com/server/');
+			->with('updater.server.url', 'https://updates.nextcloud.org/server/')
+			->willReturn('https://updates.nextcloud.org/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.owncloud.com/server/'))
+			->with($this->buildUpdateUrl('https://updates.nextcloud.org/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.owncloud.com/server/')
-			->willReturn('https://updates.owncloud.com/server/');
+			->with('updater.server.url', 'https://updates.nextcloud.org/server/')
+			->willReturn('https://updates.nextcloud.org/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.owncloud.com/server/'))
+			->with($this->buildUpdateUrl('https://updates.nextcloud.org/server/'))
 			->will($this->returnValue($updateXml));
 
 		$this->assertSame($expectedResult, $this->updater->check());