mirror of
https://codeberg.org/forgejo/forgejo.git
synced 2024-11-23 19:11:58 +01:00
d6dd6d641b
Follow up #22405 Fix #20703 This PR rewrites storage configuration read sequences with some breaks and tests. It becomes more strict than before and also fixed some inherit problems. - Move storage's MinioConfig struct into setting, so after the configuration loading, the values will be stored into the struct but not still on some section. - All storages configurations should be stored on one section, configuration items cannot be overrided by multiple sections. The prioioty of configuration is `[attachment]` > `[storage.attachments]` | `[storage.customized]` > `[storage]` > `default` - For extra override configuration items, currently are `SERVE_DIRECT`, `MINIO_BASE_PATH`, `MINIO_BUCKET`, which could be configured in another section. The prioioty of the override configuration is `[attachment]` > `[storage.attachments]` > `default`. - Add more tests for storages configurations. - Update the storage documentations. --------- Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
41 lines
1,001 B
Go
41 lines
1,001 B
Go
// Copyright 2022 The Gitea Authors. All rights reserved.
|
|
// SPDX-License-Identifier: MIT
|
|
|
|
package setting
|
|
|
|
import (
|
|
"fmt"
|
|
)
|
|
|
|
// Actions settings
|
|
var (
|
|
Actions = struct {
|
|
LogStorage *Storage // how the created logs should be stored
|
|
ArtifactStorage *Storage // how the created artifacts should be stored
|
|
Enabled bool
|
|
DefaultActionsURL string `ini:"DEFAULT_ACTIONS_URL"`
|
|
}{
|
|
Enabled: false,
|
|
DefaultActionsURL: "https://gitea.com",
|
|
}
|
|
)
|
|
|
|
func loadActionsFrom(rootCfg ConfigProvider) error {
|
|
sec := rootCfg.Section("actions")
|
|
err := sec.MapTo(&Actions)
|
|
if err != nil {
|
|
return fmt.Errorf("failed to map Actions settings: %v", err)
|
|
}
|
|
|
|
// don't support to read configuration from [actions]
|
|
Actions.LogStorage, err = getStorage(rootCfg, "actions_log", "", nil)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
actionsSec, _ := rootCfg.GetSection("actions.artifacts")
|
|
|
|
Actions.ArtifactStorage, err = getStorage(rootCfg, "actions_artifacts", "", actionsSec)
|
|
|
|
return err
|
|
}
|