a215e9db30
regression from767e9634d3. It changed the parsing of the [admin] section from being derived from the content of each key with mustMapSetting(rootCfg, "admin", &Admin) to explicitly listing all keys in the code. SEND_NOTIFICATION_EMAIL_ON_NEW_USER was not added and therefore ignored. As a consequence notifications of newly registered users were never sent. (cherry picked from commitff2a3f4e3a) Conflict: modules/setting/admin_test.go EXTERNAL_USER_DISABLE_FEATURES does not exist in v7.0
28 lines
971 B
Go
28 lines
971 B
Go
// Copyright 2023 The Gitea Authors. All rights reserved.
|
|
// SPDX-License-Identifier: MIT
|
|
|
|
package setting
|
|
|
|
import "code.gitea.io/gitea/modules/container"
|
|
|
|
// Admin settings
|
|
var Admin struct {
|
|
DisableRegularOrgCreation bool
|
|
DefaultEmailNotification string
|
|
SendNotificationEmailOnNewUser bool
|
|
UserDisabledFeatures container.Set[string]
|
|
}
|
|
|
|
func loadAdminFrom(rootCfg ConfigProvider) {
|
|
sec := rootCfg.Section("admin")
|
|
Admin.DisableRegularOrgCreation = sec.Key("DISABLE_REGULAR_ORG_CREATION").MustBool(false)
|
|
Admin.DefaultEmailNotification = sec.Key("DEFAULT_EMAIL_NOTIFICATIONS").MustString("enabled")
|
|
Admin.SendNotificationEmailOnNewUser = sec.Key("SEND_NOTIFICATION_EMAIL_ON_NEW_USER").MustBool(false)
|
|
Admin.UserDisabledFeatures = container.SetOf(sec.Key("USER_DISABLED_FEATURES").Strings(",")...)
|
|
}
|
|
|
|
const (
|
|
UserFeatureDeletion = "deletion"
|
|
UserFeatureManageSSHKeys = "manage_ssh_keys"
|
|
UserFeatureManageGPGKeys = "manage_gpg_keys"
|
|
)
|