Commit d46fd890 by Torkel Ödegaard

Merge branch 'v4.4.x'

parents 9825cd1e 8ca08d65
......@@ -184,10 +184,10 @@ snapshot_TTL_days = 90
#################################### Users ####################################
[users]
# disable user signup / registration
allow_sign_up = true
allow_sign_up = false
# 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)
auto_assign_org = true
......
......@@ -206,7 +206,7 @@ For MySQL, use either `true`, `false`, or `skip-verify`.
### max_idle_conn
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.
<hr />
......@@ -246,13 +246,13 @@ Define a white list of allowed ips/domains to use in data sources. Format: `ip_o
### allow_sign_up
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)
### allow_org_create
Set to `false` to prohibit users from creating new organizations.
Defaults to `true`.
Defaults to `false`.
### auto_assign_org
......
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