Started work on LDAP again, #1450

2015-07-10 11:10:48 +02:00
parent eb793f7feb 8eee0d574c
commit 0ef7271326
376 changed files with 32968 additions and 8624 deletions
@@ -72,8 +72,9 @@ provider = file
 # Provider config options
 # memory: not have any config yet
 # file: session dir path, is relative to grafana data_path
-# redis: config like redis server addr, poolSize, password, e.g. `127.0.0.1:6379,100,grafana`
-# mysql: go-sql-driver/mysql dsn config string, e.g. `user:password@tcp(127.0.0.1)/database_name`
+# redis: config like redis server e.g. `addr=127.0.0.1:6379,pool_size=100,db=grafana`
+# postgres: user=a password=b host=localhost port=5432 dbname=c sslmode=disable
+# mysql: go-sql-driver/mysql dsn config string, e.g. `user:password@tcp(127.0.0.1:3306)/database_name`

 provider_config = sessions

@@ -167,6 +168,10 @@ token_url = https://accounts.google.com/o/oauth2/token
 api_url = https://www.googleapis.com/oauth2/v1/userinfo
 allowed_domains =

+#################################### Basic Auth ##########################
+[auth.basic]
+enabled = true
+
 #################################### Auth Proxy ##########################
 [auth.proxy]
 enabled = false
@@ -177,7 +182,7 @@ auto_sign_up = true
 #################################### Auth LDAP ##########################
 [auth.ldap]
 enabled = true
-hosts = ldap://localhost.com:389
+hosts = ldap://127.0.0.1:389
 use_ssl = false
 base_dn = dc=grafana,dc=org
 bind_path = cn=%username%,dc=grafana,dc=org
@@ -186,6 +191,21 @@ attr_name = cn
 attr_surname = sn
 attr_email = email

+#################################### SMTP / Emailing ##########################
+[smtp]
+enabled = false
+host = localhost:25
+user =
+password =
+cert_file =
+key_file =
+skip_verify = false
+from_address = admin@grafana.localhost
+
+[emails]
+welcome_email_on_sign_up = false
+templates_pattern = emails/*.html
+
 #################################### Logging ##########################
 [log]
 # Either "console", "file", default is "console"
@@ -72,8 +72,9 @@
 # Provider config options
 # memory: not have any config yet
 # file: session dir path, is relative to grafana data_path
-# redis: config like redis server addr, poolSize, password, e.g. `127.0.0.1:6379,100,grafana`
-# mysql: go-sql-driver/mysql dsn config string, e.g. `user:password@tcp(127.0.0.1)/database_name`
+# redis: config like redis server e.g. `addr=127.0.0.1:6379,pool_size=100,db=grafana`
+# mysql: go-sql-driver/mysql dsn config string, e.g. `user:password@tcp(127.0.0.1:3306)/database_name`
+# postgres: user=a password=b host=localhost port=5432 dbname=c sslmode=disable
 ;provider_config = sessions

 # Session cookie name
@@ -173,6 +174,24 @@
 ;header_property = username
 ;auto_sign_up = true

+#################################### Basic Auth ##########################
+[auth.basic]
+;enabled = true
+
+#################################### SMTP / Emailing ##########################
+[smtp]
+;enabled = false
+;host = localhost:25
+;user =
+;password =
+;cert_file =
+;key_file =
+;skip_verify = false
+;from_address = admin@grafana.localhost
+
+[emails]
+;welcome_email_on_sign_up = false
+
 #################################### Logging ##########################
 [log]
 # Either "console", "file", default is "console"