Use the same URL everywhere

Signed-off-by: Joas Schilling <coding@schilljs.com>

diff --git a/config/config.sample.php b/config/config.sample.php
index d706b4321bc92ecb9b8402b38940d7a934543e19..82246e139c1023a39cd7ffb82c02deba465bd43c 100644 (file)
--- a/config/config.sample.php
+++ b/config/config.sample.php
@@ -519,7 +519,7 @@ $CONFIG = array(
 /**
  * URL that Nextcloud should use to look for updates
  */
-'updater.server.url' => 'https://updates.nextcloud.com/update-server/',
+'updater.server.url' => 'https://updates.nextcloud.com/updater_server/',
 
 /**
  * Is Nextcloud connected to the Internet or running in a closed network?

diff --git a/lib/private/Updater/VersionCheck.php b/lib/private/Updater/VersionCheck.php
index ee9a96a14f5fdcb3ae32df20f88c985498548d60..e745d5fc4c2ad4c711d881e76c2a5f25100d9bb7 100644 (file)
--- a/lib/private/Updater/VersionCheck.php
+++ b/lib/private/Updater/VersionCheck.php
@@ -59,7 +59,7 @@ class VersionCheck {
                        return json_decode($this->config->getAppValue('core', 'lastupdateResult'), true);
                }
 
-               $updaterUrl = $this->config->getSystemValue('updater.server.url', 'https://updates.nextcloud.com/update-server/');
+               $updaterUrl = $this->config->getSystemValue('updater.server.url', 'https://updates.nextcloud.com/updater_server/');
 
                $this->config->setAppValue('core', 'lastupdatedat', time());
 

diff --git a/tests/lib/Updater/VersionCheckTest.php b/tests/lib/Updater/VersionCheckTest.php
index c0c86c0d16792246c2d7e223b0b626ca36c096ff..f025cc02b02fc95d889b6397c85a7bd36f8f4332 100644 (file)
--- a/tests/lib/Updater/VersionCheckTest.php
+++ b/tests/lib/Updater/VersionCheckTest.php
@@ -92,7 +92,7 @@ class VersionCheckTest extends \Test\TestCase {
                $this->config
                        ->expects($this->at(1))
                        ->method('getSystemValue')
-                       ->with('updater.server.url', 'https://updates.nextcloud.com/update-server/')
+                       ->with('updater.server.url', 'https://updates.nextcloud.com/updater_server/')
                        ->willReturnArgument(1);
                $this->config
                        ->expects($this->at(2))
@@ -124,7 +124,7 @@ class VersionCheckTest extends \Test\TestCase {
                $this->updater
                        ->expects($this->once())
                        ->method('getUrlContent')
-                       ->with($this->buildUpdateUrl('https://updates.nextcloud.com/update-server/'))
+                       ->with($this->buildUpdateUrl('https://updates.nextcloud.com/updater_server/'))
                        ->will($this->returnValue($updateXml));
 
                $this->assertSame($expectedResult, $this->updater->check());
@@ -139,7 +139,7 @@ class VersionCheckTest extends \Test\TestCase {
                $this->config
                        ->expects($this->at(1))
                        ->method('getSystemValue')
-                       ->with('updater.server.url', 'https://updates.nextcloud.com/update-server/')
+                       ->with('updater.server.url', 'https://updates.nextcloud.com/updater_server/')
                        ->willReturnArgument(1);
                $this->config
                        ->expects($this->at(2))
@@ -164,7 +164,7 @@ class VersionCheckTest extends \Test\TestCase {
                $this->updater
                        ->expects($this->once())
                        ->method('getUrlContent')
-                       ->with($this->buildUpdateUrl('https://updates.nextcloud.com/update-server/'))
+                       ->with($this->buildUpdateUrl('https://updates.nextcloud.com/updater_server/'))
                        ->will($this->returnValue($updateXml));
 
                $this->assertSame([], $this->updater->check());
@@ -187,7 +187,7 @@ class VersionCheckTest extends \Test\TestCase {
                $this->config
                        ->expects($this->at(1))
                        ->method('getSystemValue')
-                       ->with('updater.server.url', 'https://updates.nextcloud.com/update-server/')
+                       ->with('updater.server.url', 'https://updates.nextcloud.com/updater_server/')
                        ->willReturnArgument(1);
                $this->config
                        ->expects($this->at(2))
@@ -215,7 +215,7 @@ class VersionCheckTest extends \Test\TestCase {
                $this->updater
                        ->expects($this->once())
                        ->method('getUrlContent')
-                       ->with($this->buildUpdateUrl('https://updates.nextcloud.com/update-server/'))
+                       ->with($this->buildUpdateUrl('https://updates.nextcloud.com/updater_server/'))
                        ->will($this->returnValue($updateXml));
 
                $this->assertSame($expectedResult, $this->updater->check());
@@ -232,7 +232,7 @@ class VersionCheckTest extends \Test\TestCase {
                $this->config
                        ->expects($this->at(1))
                        ->method('getSystemValue')
-                       ->with('updater.server.url', 'https://updates.nextcloud.com/update-server/')
+                       ->with('updater.server.url', 'https://updates.nextcloud.com/updater_server/')
                        ->willReturnArgument(1);
                $this->config
                        ->expects($this->at(2))
@@ -257,7 +257,7 @@ class VersionCheckTest extends \Test\TestCase {
                $this->updater
                        ->expects($this->once())
                        ->method('getUrlContent')
-                       ->with($this->buildUpdateUrl('https://updates.nextcloud.com/update-server/'))
+                       ->with($this->buildUpdateUrl('https://updates.nextcloud.com/updater_server/'))
                        ->will($this->returnValue($updateXml));
 
                $this->assertSame($expectedResult, $this->updater->check());