From 23558c61d48f9d13323cc1cf4bf0896ad7ebbaea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Mon, 31 Jul 2017 13:03:42 +0200 Subject: [PATCH] feat: wip work on #8768 --- conf/defaults.ini | 5 +++++ pkg/setting/setting.go | 24 +++++++++++++++--------- 2 files changed, 20 insertions(+), 9 deletions(-) diff --git a/conf/defaults.ini b/conf/defaults.ini index 47406027387..ceb916917ab 100644 --- a/conf/defaults.ini +++ b/conf/defaults.ini @@ -204,6 +204,11 @@ login_hint = email or username # Default UI theme ("dark" or "light") default_theme = dark +# External user management +external_manage_link_url = +external_manage_link_name = +external_manage_info = + [auth] # Set to true to disable (hide) the login form, useful if you use OAuth disable_login_form = false diff --git a/pkg/setting/setting.go b/pkg/setting/setting.go index 9ec995dd96e..95fd944f034 100644 --- a/pkg/setting/setting.go +++ b/pkg/setting/setting.go @@ -90,15 +90,18 @@ var ( SnapShotRemoveExpired bool // User settings - AllowUserSignUp bool - AllowUserOrgCreate bool - AutoAssignOrg bool - AutoAssignOrgRole string - VerifyEmailEnabled bool - LoginHint string - DefaultTheme string - DisableLoginForm bool - DisableSignoutMenu bool + AllowUserSignUp bool + AllowUserOrgCreate bool + AutoAssignOrg bool + AutoAssignOrgRole string + VerifyEmailEnabled bool + LoginHint string + DefaultTheme string + DisableLoginForm bool + DisableSignoutMenu bool + ManageUsersLinkUrl string + ManageUsersLinkName string + ManageUsersInfo string // Http auth AdminUser string @@ -531,6 +534,9 @@ func NewConfigContext(args *CommandLineArgs) error { VerifyEmailEnabled = users.Key("verify_email_enabled").MustBool(false) LoginHint = users.Key("login_hint").String() DefaultTheme = users.Key("default_theme").String() + ManageUsersLinkUrl = users.Key("external_manage_link_url").String() + ManageUsersLinkName = users.Key("external_manage_link_name").String() + ManageUsersInfo = users.Key("external_manage_info").String() // auth auth := Cfg.Section("auth")