changeset 5365:ef64905223f5

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.
author Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
date Thu, 16 Jul 2015 17:40:35 +0200
parents a478cad966b1
children ce72c36f7a0e
files development.ini kallithea/bin/template.ini.mako kallithea/config/deployment.ini_tmpl test.ini
diffstat 4 files changed, 48 insertions(+), 16 deletions(-) [+]
line wrap: on
line diff
--- a/development.ini	Thu Aug 06 22:37:18 2015 +0200
+++ b/development.ini	Thu Jul 16 17:40:35 2015 +0200
@@ -20,15 +20,23 @@
 ## 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.)
--- a/kallithea/bin/template.ini.mako	Thu Aug 06 22:37:18 2015 +0200
+++ b/kallithea/bin/template.ini.mako	Thu Jul 16 17:40:35 2015 +0200
@@ -14,15 +14,23 @@
 <%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>
--- a/kallithea/config/deployment.ini_tmpl	Thu Aug 06 22:37:18 2015 +0200
+++ b/kallithea/config/deployment.ini_tmpl	Thu Jul 16 17:40:35 2015 +0200
@@ -15,15 +15,23 @@
 ## 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.)
--- a/test.ini	Thu Aug 06 22:37:18 2015 +0200
+++ b/test.ini	Thu Jul 16 17:40:35 2015 +0200
@@ -19,15 +19,23 @@
 ## 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.)