IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Admin: Add support to configure default admin email (#54363)

Browse Source
This commit is contained in:
mhuangwm 2022-09-07 08:38:40 -04:00 committed by GitHub
parent 687b0b1726
commit 39102c6656
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
conf/defaults.ini
View File

@ -247,6 +247,9 @@ admin_user = admin
# default admin password, can be changed before first start of grafana, or in profile settings # default admin password, can be changed before first start of grafana, or in profile settings
admin_password = admin admin_password = admin
# default admin email, created on startup
admin_email = admin@localhost
# used for signing # used for signing
secret_key = SW2YcwTIb9zpOOhoPsMm secret_key = SW2YcwTIb9zpOOhoPsMm

3
conf/sample.ini
View File

@ -247,6 +247,9 @@
# default admin password, can be changed before first start of grafana, or in profile settings # default admin password, can be changed before first start of grafana, or in profile settings
;admin_password = admin ;admin_password = admin
# default admin email, created on startup
;admin_email = admin@localhost
# used for signing # used for signing
;secret_key = SW2YcwTIb9zpOOhoPsMm ;secret_key = SW2YcwTIb9zpOOhoPsMm

2
pkg/services/sqlstore/sqlstore.go
View File

@ -208,7 +208,7 @@ func (ss *SQLStore) ensureMainOrgAndAdminUser() error {
ss.log.Debug("Creating default admin user") ss.log.Debug("Creating default admin user")
if _, err := ss.createUser(ctx, sess, user.CreateUserCommand{ if _, err := ss.createUser(ctx, sess, user.CreateUserCommand{
Login: ss.Cfg.AdminUser, Login: ss.Cfg.AdminUser,
Email: ss.Cfg.AdminUser + "@localhost", Email: ss.Cfg.AdminEmail,
Password: ss.Cfg.AdminPassword, Password: ss.Cfg.AdminPassword,
IsAdmin: true, IsAdmin: true,
}); err != nil { }); err != nil {

2
pkg/setting/setting.go
View File

@ -293,6 +293,7 @@ type Cfg struct {
BasicAuthEnabled bool BasicAuthEnabled bool
AdminUser string AdminUser string
AdminPassword string AdminPassword string
AdminEmail string
// AWS Plugin Auth // AWS Plugin Auth
AWSAllowedAuthProviders []string AWSAllowedAuthProviders []string
@ -1254,6 +1255,7 @@ func readSecuritySettings(iniFile *ini.File, cfg *Cfg) error {
cfg.DisableInitAdminCreation = security.Key("disable_initial_admin_creation").MustBool(false) cfg.DisableInitAdminCreation = security.Key("disable_initial_admin_creation").MustBool(false)
cfg.AdminUser = valueAsString(security, "admin_user", "") cfg.AdminUser = valueAsString(security, "admin_user", "")
cfg.AdminPassword = valueAsString(security, "admin_password", "") cfg.AdminPassword = valueAsString(security, "admin_password", "")
cfg.AdminEmail = valueAsString(security, "admin_email", fmt.Sprintf("%s@localhost", cfg.AdminUser))
return nil return nil
} }