opensource/grafana
1
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-08-01 05:41:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'v4.4.x'

Browse Source
This commit is contained in:
Torkel Ödegaard
2017-07-24 12:38:39 +02:00
parent 9825cd1ebb 8ca08d65e7
commit d46fd890a5
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
conf/defaults.ini
View File

@ -184,10 +184,10 @@ snapshot_TTL_days = 90
#################################### Users #################################### #################################### Users ####################################
[users] [users]
# disable user signup / registration # disable user signup / registration
allow_sign_up = true allow_sign_up = false
# Allow non admin users to create organizations # Allow non admin users to create organizations
allow_org_create = true allow_org_create = false
# Set to true to automatically assign new users to the default organization (id 1) # Set to true to automatically assign new users to the default organization (id 1)
auto_assign_org = true auto_assign_org = true

6
docs/sources/installation/configuration.md
View File

@ -206,7 +206,7 @@ For MySQL, use either `true`, `false`, or `skip-verify`.
### max_idle_conn ### max_idle_conn
The maximum number of connections in the idle connection pool. The maximum number of connections in the idle connection pool.
### max_open_conn ### max_open_conn
The maximum number of open connections to the database. The maximum number of open connections to the database.
<hr /> <hr />
@ -246,13 +246,13 @@ Define a white list of allowed ips/domains to use in data sources. Format: `ip_o
### allow_sign_up ### allow_sign_up
Set to `false` to prohibit users from being able to sign up / create Set to `false` to prohibit users from being able to sign up / create
user accounts. Defaults to `true`. The admin user can still create user accounts. Defaults to `false`. The admin user can still create
users from the [Grafana Admin Pages](../../reference/admin) users from the [Grafana Admin Pages](../../reference/admin)
### allow_org_create ### allow_org_create
Set to `false` to prohibit users from creating new organizations. Set to `false` to prohibit users from creating new organizations.
Defaults to `true`. Defaults to `false`.
### auto_assign_org ### auto_assign_org