Commit 80d88d30 by Torkel Ödegaard

fix(config): changed default for oauth and allow_sign_up setting, #6928

parent 9da44141
...@@ -209,7 +209,7 @@ org_role = Viewer ...@@ -209,7 +209,7 @@ org_role = Viewer
#################################### Github Auth ######################### #################################### Github Auth #########################
[auth.github] [auth.github]
enabled = false enabled = false
allow_sign_up = false allow_sign_up = true
client_id = some_id client_id = some_id
client_secret = some_secret client_secret = some_secret
scopes = user:email scopes = user:email
...@@ -222,7 +222,7 @@ allowed_organizations = ...@@ -222,7 +222,7 @@ allowed_organizations =
#################################### Google Auth ######################### #################################### Google Auth #########################
[auth.google] [auth.google]
enabled = false enabled = false
allow_sign_up = false allow_sign_up = true
client_id = some_client_id client_id = some_client_id
client_secret = some_client_secret client_secret = some_client_secret
scopes = https://www.googleapis.com/auth/userinfo.profile https://www.googleapis.com/auth/userinfo.email scopes = https://www.googleapis.com/auth/userinfo.profile https://www.googleapis.com/auth/userinfo.email
...@@ -235,7 +235,7 @@ hosted_domain = ...@@ -235,7 +235,7 @@ hosted_domain =
#################################### Grafana.net Auth #################### #################################### Grafana.net Auth ####################
[auth.grafananet] [auth.grafananet]
enabled = false enabled = false
allow_sign_up = false allow_sign_up = true
client_id = some_id client_id = some_id
client_secret = some_secret client_secret = some_secret
scopes = user:email scopes = user:email
...@@ -244,7 +244,7 @@ allowed_organizations = ...@@ -244,7 +244,7 @@ allowed_organizations =
#################################### Generic OAuth ####################### #################################### Generic OAuth #######################
[auth.generic_oauth] [auth.generic_oauth]
enabled = false enabled = false
allow_sign_up = false allow_sign_up = true
client_id = some_id client_id = some_id
client_secret = some_secret client_secret = some_secret
scopes = user:email scopes = user:email
......
...@@ -194,7 +194,7 @@ ...@@ -194,7 +194,7 @@
#################################### Github Auth ########################## #################################### Github Auth ##########################
[auth.github] [auth.github]
;enabled = false ;enabled = false
;allow_sign_up = false ;allow_sign_up = true
;client_id = some_id ;client_id = some_id
;client_secret = some_secret ;client_secret = some_secret
;scopes = user:email,read:org ;scopes = user:email,read:org
...@@ -207,7 +207,7 @@ ...@@ -207,7 +207,7 @@
#################################### Google Auth ########################## #################################### Google Auth ##########################
[auth.google] [auth.google]
;enabled = false ;enabled = false
;allow_sign_up = false ;allow_sign_up = true
;client_id = some_client_id ;client_id = some_client_id
;client_secret = some_client_secret ;client_secret = some_client_secret
;scopes = https://www.googleapis.com/auth/userinfo.profile https://www.googleapis.com/auth/userinfo.email ;scopes = https://www.googleapis.com/auth/userinfo.profile https://www.googleapis.com/auth/userinfo.email
...@@ -219,7 +219,7 @@ ...@@ -219,7 +219,7 @@
#################################### Generic OAuth ########################## #################################### Generic OAuth ##########################
[auth.generic_oauth] [auth.generic_oauth]
;enabled = false ;enabled = false
;allow_sign_up = false ;allow_sign_up = true
;client_id = some_id ;client_id = some_id
;client_secret = some_secret ;client_secret = some_secret
;scopes = user:email,read:org ;scopes = user:email,read:org
...@@ -232,7 +232,7 @@ ...@@ -232,7 +232,7 @@
#################################### Grafana.net Auth #################### #################################### Grafana.net Auth ####################
[auth.grafananet] [auth.grafananet]
;enabled = false ;enabled = false
;allow_sign_up = false ;allow_sign_up = true
;client_id = some_id ;client_id = some_id
;client_secret = some_secret ;client_secret = some_secret
;scopes = user:email ;scopes = user:email
......
...@@ -289,6 +289,7 @@ example: ...@@ -289,6 +289,7 @@ example:
[auth.github] [auth.github]
enabled = true enabled = true
allow_sign_up = true
client_id = YOUR_GITHUB_APP_CLIENT_ID client_id = YOUR_GITHUB_APP_CLIENT_ID
client_secret = YOUR_GITHUB_APP_CLIENT_SECRET client_secret = YOUR_GITHUB_APP_CLIENT_SECRET
scopes = user:email scopes = user:email
...@@ -323,7 +324,7 @@ Grafana instance. For example: ...@@ -323,7 +324,7 @@ Grafana instance. For example:
team_ids = 150,300 team_ids = 150,300
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
allow_sign_up = false allow_sign_up = true
### allowed_organizations ### allowed_organizations
...@@ -367,7 +368,7 @@ Secret. Specify these in the Grafana configuration file. For example: ...@@ -367,7 +368,7 @@ Secret. Specify these in the Grafana configuration file. For example:
auth_url = https://accounts.google.com/o/oauth2/auth auth_url = https://accounts.google.com/o/oauth2/auth
token_url = https://accounts.google.com/o/oauth2/token token_url = https://accounts.google.com/o/oauth2/token
allowed_domains = mycompany.com mycompany.org allowed_domains = mycompany.com mycompany.org
allow_sign_up = false allow_sign_up = true
Restart the Grafana back-end. You should now see a Google login button Restart the Grafana back-end. You should now see a Google login button
on the login page. You can now login or sign up with your Google on the login page. You can now login or sign up with your Google
...@@ -394,7 +395,7 @@ browser to access Grafana, but with the prefix path of `/login/generic_oauth`. ...@@ -394,7 +395,7 @@ browser to access Grafana, but with the prefix path of `/login/generic_oauth`.
token_url = token_url =
api_url = api_url =
allowed_domains = mycompany.com mycompany.org allowed_domains = mycompany.com mycompany.org
allow_sign_up = false allow_sign_up = true
Set api_url to the resource that returns basic user info. Set api_url to the resource that returns basic user info.
......
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