config now in settings

This commit is contained in:
Sebastian Frank
2019-03-06 12:26:09 +01:00
parent 311e8e49ba
commit 71edd8bbf3
6 changed files with 197 additions and 18 deletions

View File

@@ -10,13 +10,13 @@ if (COCKPIT_ADMIN && !COCKPIT_API_REQUEST) {
// Extend addon functions.
$this->module('drone')->extend([
'fetchDeploys' => function ($limit = 50) {
$settings = $this->app->config['drone'] ?? FALSE;
$settings = $this->app->storage->findOne('drone/settings') ?? FALSE;
if (!$settings || !isset($settings['url'],
$settings['owner'],
$settings['project'],
$settings['target'],
$settings['token'])) {
$settings['token']) || !$settings['active']) {
return [];
}
@@ -85,13 +85,13 @@ if (COCKPIT_ADMIN && !COCKPIT_API_REQUEST) {
},
'createDeploy' => function ($fromBuild) {
$settings = $this->app->config['drone'];
$settings = $this->app->storage->findOne('drone/settings');
if (!$fromBuild || !$settings || !isset($settings['url'],
$settings['owner'],
$settings['project'],
$settings['target'],
$settings['token'])) {
$settings['token']) || !$settings['active']) {
return array(
"error" => "missing settings"