upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-12 10:10:49 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 22

Move OC_Channel to system config

Browse source 
The Nextcloud and ownCloud updaters allow someone to configure a custom release channel, this can then be used to publish different versions. (e.g. one channel stays on 9.x while another one already gets 10.x)

There is however one big problem with it: The value is effectively stored in the app config, which is stored in the database. So to be able to read the update channel a connection to the database is necessary. This is quite error prone and also causes some of the issues in the original ownCloud updater.

This moves the channel registration to the config.php and also includes a repair step.
This commit is contained in:
Lukas Reschke 2016-06-26 17:02:03 +02:00 committed by Morris Jobke
parent efc4a1b3bf
commit 9f7141d26d
No known key found for this signature in database
GPG key ID: 9CE5ED29E7FCD38A
5 changed files with 62 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
config/config.sample.php
View file

@ -500,6 +500,11 @@ $CONFIG = array(
*/
'updater.server.url' => 'https://updates.nextcloud.org/server/',
/**
* Release channel to use for updates
*/
'updater.release.channel' => 'stable',
/**
* Is Nextcloud connected to the Internet or running in a closed network?
*/

2
lib/private/repair.php
View file

@ -37,6 +37,7 @@ use OC\Repair\Collation;
use OC\Repair\CopyRewriteBaseToConfig;
use OC\Repair\DropOldJobs;
use OC\Repair\EncryptionCompatibility;
use OC\Repair\MoveChannelToSystemConfig;
use OC\Repair\OldGroupMembershipShares;
use OC\Repair\RemoveGetETagEntries;
use OC\Repair\SqliteAutoincrement;
@ -118,6 +119,7 @@ class Repair extends BasicEmitter {
new UpdateOutdatedOcsIds(\OC::$server->getConfig()),
new RepairInvalidShares(\OC::$server->getConfig(), \OC::$server->getDatabaseConnection()),
new AvatarPermissions(\OC::$server->getDatabaseConnection()),
new MoveChannelToSystemConfig(\OC::$server->getConfig()),
];
}

51
lib/private/repair/movechanneltosystemconfig.php Normal file
View file

@ -0,0 +1,51 @@
<?php
/**
* @copyright Copyright (c) 2016 Lukas Reschke <lukas@statuscode.ch>
*
* @license GNU AGPL version 3 or any later version
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as
* published by the Free Software Foundation, either version 3 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/
namespace OC\Repair;
use OC\Hooks\BasicEmitter;
use OCP\IConfig;
/**
* Class MoveChannelToSystemConfig moves the defined OC_Channel in the app config
* to the system config to be compatible with the Nextcloud updater.
*
* @package OC\Repair
*/
class MoveChannelToSystemConfig extends BasicEmitter implements \OC\RepairStep {
/** @var IConfig */
private $config;
public function __construct(IConfig $config) {
$this->config = $config;
}
public function getName() {
return 'Moves the stored release channel to the config file';
}
public function run() {
$channel = $this->config->getAppValue('core', 'OC_Channel', '');
if($channel !== '') {
$this->config->setSystemValue('updater.release.channel', $channel);
$this->config->deleteAppValue('core', 'OC_Channel');
}
}
}

5
lib/private/util.php
View file

@ -384,7 +384,8 @@ class OC_Util {
}
/**
* @description get the update channel of the current installed of ownCloud.
* Get the currently configured release channel
*
* @return string
*/
public static function getChannel() {
@ -421,7 +422,7 @@ class OC_Util {
// Allow overriding update channel
if (\OC::$server->getSystemConfig()->getValue('installed', false)) {
$channel = \OC::$server->getAppConfig()->getValue('core', 'OC_Channel');
$channel = \OC::$server->getConfig()->getSystemValue('updater.release.channel', null);
} else {
/** @var $OC_Channel string */
$channel = $OC_Channel;

2
lib/public/util.php
View file

@ -79,8 +79,8 @@ class Util {
*/
public static function setChannel($channel) {
//Flush timestamp to reload version.php
\OC::$server->getConfig()->setSystemValue('updater.release.channel', $channel);
\OC::$server->getSession()->set('OC_Version_Timestamp', 0);
\OC::$server->getAppConfig()->setValue('core', 'OC_Channel', $channel);
}
/**