# HG changeset patch
# User Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
# Date 2015-07-16 17:40:35
# Node ID ef64905223f50c77a28c4d756abdfc9aab11d477
# Parent  a478cad966b1122f8e232315926eb1224d56b361

e-mail: add some default values and some examples to .ini file as comments

This includes a replacement of @localhost examples to @example.com, to
indicate that real addresses should normally be used.

diff --git a/development.ini b/development.ini
--- a/development.ini
+++ b/development.ini
@@ -20,15 +20,23 @@ pdebug = false
 ## any error reports after application crash                                  ##
 ## Additionally those settings will be used by Kallithea mailing system       ##
 ################################################################################
+#app_email_from = Kallithea
+#app_email_from = Kallithea <kallithea-noreply@example.com>
+#app_email_from = kallithea-noreply@example.com
+#email_prefix =
+#email_prefix = [Kallithea]
+
 #email_to = admin@localhost
-#error_email_from = paste_error@localhost
-#app_email_from = kallithea-noreply@localhost
-#email_prefix = [Kallithea]
+#email_to = admin@example.com
+#email_to = admin@example.com another_admin@example.com
+#error_email_from = pylons@yourapp.com
+#error_email_from = Kallithea Errors <kallithea-noreply@example.com>
+#error_email_from = paste_error@example.com
 
 #smtp_server = mail.server.com
 #smtp_username =
 #smtp_password =
-#smtp_port =
+#smtp_port = 25
 #smtp_use_tls = false
 #smtp_use_ssl = false
 ## Specify available auth parameters here (e.g. LOGIN PLAIN CRAM-MD5, etc.)
diff --git a/kallithea/bin/template.ini.mako b/kallithea/bin/template.ini.mako
--- a/kallithea/bin/template.ini.mako
+++ b/kallithea/bin/template.ini.mako
@@ -14,15 +14,23 @@ pdebug = false
 <%text>## any error reports after application crash                                  ##</%text>
 <%text>## Additionally those settings will be used by Kallithea mailing system       ##</%text>
 <%text>################################################################################</%text>
+#app_email_from = Kallithea
+#app_email_from = Kallithea <kallithea-noreply@example.com>
+#app_email_from = kallithea-noreply@example.com
+#email_prefix =
+#email_prefix = [Kallithea]
+
 #email_to = admin@localhost
-#error_email_from = paste_error@localhost
-#app_email_from = kallithea-noreply@localhost
-#email_prefix = [Kallithea]
+#email_to = admin@example.com
+#email_to = admin@example.com another_admin@example.com
+#error_email_from = pylons@yourapp.com
+#error_email_from = Kallithea Errors <kallithea-noreply@example.com>
+#error_email_from = paste_error@example.com
 
 #smtp_server = mail.server.com
 #smtp_username =
 #smtp_password =
-#smtp_port =
+#smtp_port = 25
 #smtp_use_tls = false
 #smtp_use_ssl = false
 <%text>## Specify available auth parameters here (e.g. LOGIN PLAIN CRAM-MD5, etc.)</%text>
diff --git a/kallithea/config/deployment.ini_tmpl b/kallithea/config/deployment.ini_tmpl
--- a/kallithea/config/deployment.ini_tmpl
+++ b/kallithea/config/deployment.ini_tmpl
@@ -15,15 +15,23 @@ pdebug = false
 ## any error reports after application crash                                  ##
 ## Additionally those settings will be used by Kallithea mailing system       ##
 ################################################################################
+#app_email_from = Kallithea
+#app_email_from = Kallithea <kallithea-noreply@example.com>
+#app_email_from = kallithea-noreply@example.com
+#email_prefix =
+#email_prefix = [Kallithea]
+
 #email_to = admin@localhost
-#error_email_from = paste_error@localhost
-#app_email_from = kallithea-noreply@localhost
-#email_prefix = [Kallithea]
+#email_to = admin@example.com
+#email_to = admin@example.com another_admin@example.com
+#error_email_from = pylons@yourapp.com
+#error_email_from = Kallithea Errors <kallithea-noreply@example.com>
+#error_email_from = paste_error@example.com
 
 #smtp_server = mail.server.com
 #smtp_username =
 #smtp_password =
-#smtp_port =
+#smtp_port = 25
 #smtp_use_tls = false
 #smtp_use_ssl = false
 ## Specify available auth parameters here (e.g. LOGIN PLAIN CRAM-MD5, etc.)
diff --git a/test.ini b/test.ini
--- a/test.ini
+++ b/test.ini
@@ -19,15 +19,23 @@ pdebug = false
 ## any error reports after application crash                                  ##
 ## Additionally those settings will be used by Kallithea mailing system       ##
 ################################################################################
+#app_email_from = Kallithea
+#app_email_from = Kallithea <kallithea-noreply@example.com>
+#app_email_from = kallithea-noreply@example.com
+#email_prefix =
+#email_prefix = [Kallithea]
+
 #email_to = admin@localhost
-#error_email_from = paste_error@localhost
-#app_email_from = kallithea-noreply@localhost
-#email_prefix = [Kallithea]
+#email_to = admin@example.com
+#email_to = admin@example.com another_admin@example.com
+#error_email_from = pylons@yourapp.com
+#error_email_from = Kallithea Errors <kallithea-noreply@example.com>
+#error_email_from = paste_error@example.com
 
 #smtp_server = mail.server.com
 #smtp_username =
 #smtp_password =
-#smtp_port =
+#smtp_port = 25
 #smtp_use_tls = false
 #smtp_use_ssl = false
 ## Specify available auth parameters here (e.g. LOGIN PLAIN CRAM-MD5, etc.)