Skip to content

N
nexpie-grafana-theme
Commit 21fed8c5 by Sofia Papagiannaki Committed by GitHub
Options

OAuth: Add missing setting from defaults.ini (#20691)

parent 2f101d1d
Showing with 15 additions and 9 deletions
conf/defaults.ini
...@@ -318,6 +318,7 @@ scopes = user:email,read:org ...@@ -318,6 +318,7 @@ scopes = user:email,read:org
auth_url = https://github.com/login/oauth/authorize auth_url = https://github.com/login/oauth/authorize
token_url = https://github.com/login/oauth/access_token token_url = https://github.com/login/oauth/access_token
api_url = https://api.github.com/user api_url = https://api.github.com/user
allowed_domains =
team_ids = team_ids =
allowed_organizations = allowed_organizations =
...@@ -331,6 +332,7 @@ scopes = api ...@@ -331,6 +332,7 @@ scopes = api
auth_url = https://gitlab.com/oauth/authorize auth_url = https://gitlab.com/oauth/authorize
token_url = https://gitlab.com/oauth/token token_url = https://gitlab.com/oauth/token
api_url = https://gitlab.com/api/v4 api_url = https://gitlab.com/api/v4
allowed_domains =
allowed_groups = allowed_groups =
#################################### Google Auth ######################### #################################### Google Auth #########################
...@@ -378,6 +380,7 @@ role_attribute_path = ...@@ -378,6 +380,7 @@ role_attribute_path =
auth_url = auth_url =
token_url = token_url =
api_url = api_url =
allowed_domains =
team_ids = team_ids =
allowed_organizations = allowed_organizations =
tls_skip_verify_insecure = false tls_skip_verify_insecure = false
......
conf/sample.ini
...@@ -317,20 +317,22 @@ ...@@ -317,20 +317,22 @@
;auth_url = https://github.com/login/oauth/authorize ;auth_url = https://github.com/login/oauth/authorize
;token_url = https://github.com/login/oauth/access_token ;token_url = https://github.com/login/oauth/access_token
;api_url = https://api.github.com/user ;api_url = https://api.github.com/user
;allowed_domains =
;team_ids = ;team_ids =
;allowed_organizations = ;allowed_organizations =
#################################### GitLab Auth ######################### #################################### GitLab Auth #########################
[auth.gitlab] [auth.gitlab]
; enabled = false ;enabled = false
; allow_sign_up = true ;allow_sign_up = true
; client_id = some_id ;client_id = some_id
; client_secret = some_secret ;client_secret = some_secret
; scopes = api ;scopes = api
; auth_url = https://gitlab.com/oauth/authorize ;auth_url = https://gitlab.com/oauth/authorize
; token_url = https://gitlab.com/oauth/token ;token_url = https://gitlab.com/oauth/token
; api_url = https://gitlab.com/api/v4 ;api_url = https://gitlab.com/api/v4
; allowed_groups = ;allowed_domains =
;allowed_groups =
#################################### Google Auth ########################## #################################### Google Auth ##########################
[auth.google] [auth.google]
...@@ -367,6 +369,7 @@ ...@@ -367,6 +369,7 @@
;auth_url = https://foo.bar/login/oauth/authorize ;auth_url = https://foo.bar/login/oauth/authorize
;token_url = https://foo.bar/login/oauth/access_token ;token_url = https://foo.bar/login/oauth/access_token
;api_url = https://foo.bar/user ;api_url = https://foo.bar/user
;allowed_domains =
;team_ids = ;team_ids =
;allowed_organizations = ;allowed_organizations =
;role_attribute_path = ;role_attribute_path =
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment