Merge branch 'emailing'

2015-06-08 17:57:33 +02:00
parent 901685bb63 db0c442eaf
commit 95fd34ed14
43 changed files with 1043 additions and 53 deletions
@@ -175,6 +175,20 @@ header_name = X-WEBAUTH-USER
 header_property = username
 auto_sign_up = 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"
@@ -174,6 +174,20 @@
 ;header_property = username
 ;auto_sign_up = 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"