diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2018-02-02 12:18:29 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-02 12:18:29 +0100 |
| commit | b2e3e292661216902a0c9078cc2bf5098bd15ce8 (patch) | |
| tree | a1b145781994b1c7e3d5a07c540ddbb3eca82e68 /apps | |
| parent | 6989c65acf55ae358e0bcc627782c91682fb5348 (diff) | |
| parent | d9e229ab70f153c0ad602da32c3a9939e9133ea3 (diff) | |
| download | nextcloud-server-b2e3e292661216902a0c9078cc2bf5098bd15ce8.tar.gz nextcloud-server-b2e3e292661216902a0c9078cc2bf5098bd15ce8.zip | |
Merge pull request #8142 from nextcloud/13-update-server
[stable13] Use correct update server
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/updatenotification/lib/Controller/AdminController.php | 2 | ||||
| -rw-r--r-- | apps/updatenotification/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 9d2a5074a4a..c96326c862e 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 75588a1aec5..6eb049f6281 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', ]; |