From d9e229ab70f153c0ad602da32c3a9939e9133ea3 Mon Sep 17 00:00:00 2001 From: Morris Jobke Date: Thu, 1 Feb 2018 13:22:36 +0100 Subject: [PATCH] Use correct update server Signed-off-by: Morris Jobke --- .../lib/Controller/AdminController.php | 2 +- .../tests/Controller/AdminControllerTest.php | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/apps/updatenotification/lib/Controller/AdminController.php b/apps/updatenotification/lib/Controller/AdminController.php index 9d2a5074a4..c96326c862 100644 --- a/apps/updatenotification/lib/Controller/AdminController.php +++ b/apps/updatenotification/lib/Controller/AdminController.php @@ -107,7 +107,7 @@ class AdminController extends Controller implements ISettings { $notifyGroups = json_decode($this->config->getAppValue('updatenotification', 'notify_groups', '["admin"]'), true); - $defaultUpdateServerURL = 'https://updates.nextcloud.com/server/'; + $defaultUpdateServerURL = 'https://updates.nextcloud.com/updater_server/'; $updateServerURL = $this->config->getSystemValue('updater.server.url', $defaultUpdateServerURL); $params = [ diff --git a/apps/updatenotification/tests/Controller/AdminControllerTest.php b/apps/updatenotification/tests/Controller/AdminControllerTest.php index 75588a1aec..6eb049f628 100644 --- a/apps/updatenotification/tests/Controller/AdminControllerTest.php +++ b/apps/updatenotification/tests/Controller/AdminControllerTest.php @@ -107,8 +107,8 @@ class AdminControllerTest extends TestCase { $this->config ->expects($this->once()) ->method('getSystemValue') - ->with('updater.server.url', 'https://updates.nextcloud.com/server/') - ->willReturn('https://updates.nextcloud.com/server/'); + ->with('updater.server.url', 'https://updates.nextcloud.com/updater_server/') + ->willReturn('https://updates.nextcloud.com/updater_server/'); $this->dateTimeFormatter ->expects($this->once()) ->method('formatDateTime') @@ -134,7 +134,7 @@ class AdminControllerTest extends TestCase { 'downloadLink' => 'https://downloads.nextcloud.org/server', 'updaterEnabled' => true, 'isDefaultUpdateServerURL' => true, - 'updateServerURL' => 'https://updates.nextcloud.com/server/', + 'updateServerURL' => 'https://updates.nextcloud.com/updater_server/', 'notify_groups' => 'admin', ]; @@ -166,8 +166,8 @@ class AdminControllerTest extends TestCase { $this->config ->expects($this->once()) ->method('getSystemValue') - ->with('updater.server.url', 'https://updates.nextcloud.com/server/') - ->willReturn('https://updates.nextcloud.com/server/'); + ->with('updater.server.url', 'https://updates.nextcloud.com/updater_server/') + ->willReturn('https://updates.nextcloud.com/updater_server/'); $this->dateTimeFormatter ->expects($this->once()) ->method('formatDateTime') @@ -188,7 +188,7 @@ class AdminControllerTest extends TestCase { 'downloadLink' => '', 'updaterEnabled' => 0, 'isDefaultUpdateServerURL' => true, - 'updateServerURL' => 'https://updates.nextcloud.com/server/', + 'updateServerURL' => 'https://updates.nextcloud.com/updater_server/', 'notify_groups' => 'admin', ];