Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
N
nexpie-grafana-theme
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Registry
Registry
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Kornkitt Poolsup
nexpie-grafana-theme
Commits
80d88d30
Commit
80d88d30
authored
Dec 12, 2016
by
Torkel Ödegaard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix(config): changed default for oauth and allow_sign_up setting, #6928
parent
9da44141
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
12 additions
and
11 deletions
+12
-11
conf/defaults.ini
+4
-4
conf/sample.ini
+4
-4
docs/sources/installation/configuration.md
+4
-3
No files found.
conf/defaults.ini
View file @
80d88d30
...
...
@@ -209,7 +209,7 @@ org_role = Viewer
#################################### Github Auth #########################
[auth.github]
enabled
=
false
allow_sign_up
=
fals
e
allow_sign_up
=
tru
e
client_id
=
some_id
client_secret
=
some_secret
scopes
=
user:email
...
...
@@ -222,7 +222,7 @@ allowed_organizations =
#################################### Google Auth #########################
[auth.google]
enabled
=
false
allow_sign_up
=
fals
e
allow_sign_up
=
tru
e
client_id
=
some_client_id
client_secret
=
some_client_secret
scopes
=
https://www.googleapis.com/auth/userinfo.profile https://www.googleapis.com/auth/userinfo.email
...
...
@@ -235,7 +235,7 @@ hosted_domain =
#################################### Grafana.net Auth ####################
[auth.grafananet]
enabled
=
false
allow_sign_up
=
fals
e
allow_sign_up
=
tru
e
client_id
=
some_id
client_secret
=
some_secret
scopes
=
user:email
...
...
@@ -244,7 +244,7 @@ allowed_organizations =
#################################### Generic OAuth #######################
[auth.generic_oauth]
enabled
=
false
allow_sign_up
=
fals
e
allow_sign_up
=
tru
e
client_id
=
some_id
client_secret
=
some_secret
scopes
=
user:email
...
...
conf/sample.ini
View file @
80d88d30
...
...
@@ -194,7 +194,7 @@
#################################### Github Auth ##########################
[auth.github]
;enabled = false
;allow_sign_up =
fals
e
;allow_sign_up =
tru
e
;client_id = some_id
;client_secret = some_secret
;scopes = user:email,read:org
...
...
@@ -207,7 +207,7 @@
#################################### Google Auth ##########################
[auth.google]
;enabled = false
;allow_sign_up =
fals
e
;allow_sign_up =
tru
e
;client_id = some_client_id
;client_secret = some_client_secret
;scopes = https://www.googleapis.com/auth/userinfo.profile https://www.googleapis.com/auth/userinfo.email
...
...
@@ -219,7 +219,7 @@
#################################### Generic OAuth ##########################
[auth.generic_oauth]
;enabled = false
;allow_sign_up =
fals
e
;allow_sign_up =
tru
e
;client_id = some_id
;client_secret = some_secret
;scopes = user:email,read:org
...
...
@@ -232,7 +232,7 @@
#################################### Grafana.net Auth ####################
[auth.grafananet]
;enabled = false
;allow_sign_up =
fals
e
;allow_sign_up =
tru
e
;client_id = some_id
;client_secret = some_secret
;scopes = user:email
...
...
docs/sources/installation/configuration.md
View file @
80d88d30
...
...
@@ -289,6 +289,7 @@ example:
[auth.github]
enabled = true
allow_sign_up = true
client_id = YOUR_GITHUB_APP_CLIENT_ID
client_secret = YOUR_GITHUB_APP_CLIENT_SECRET
scopes = user:email
...
...
@@ -323,7 +324,7 @@ Grafana instance. For example:
team_ids = 150,300
auth_url = https://github.com/login/oauth/authorize
token_url = https://github.com/login/oauth/access_token
allow_sign_up =
fals
e
allow_sign_up =
tru
e
### allowed_organizations
...
...
@@ -367,7 +368,7 @@ Secret. Specify these in the Grafana configuration file. For example:
auth_url = https://accounts.google.com/o/oauth2/auth
token_url = https://accounts.google.com/o/oauth2/token
allowed_domains = mycompany.com mycompany.org
allow_sign_up =
fals
e
allow_sign_up =
tru
e
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
...
...
@@ -394,7 +395,7 @@ browser to access Grafana, but with the prefix path of `/login/generic_oauth`.
token_url =
api_url =
allowed_domains = mycompany.com mycompany.org
allow_sign_up =
fals
e
allow_sign_up =
tru
e
Set api_url to the resource that returns basic user info.
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment