# HG changeset patch
# User Mads Kiilerich <mads@kiilerich.com>
# Date 2019-06-07 01:37:07
# Node ID cbdc0c3a54065740fa6846afd9eb8b4c840a7a3b
# Parent  b0ed41df0282315d0e57edf8ff8c557ee0e1e331

config: change default .ini to always include trace_errors settings and thus avoid deprecation warnings

Gets rid of:

data/env/lib/python2.7/site-packages/tg/configuration/app_config.py:473
  data/env/lib/python2.7/site-packages/tg/configuration/app_config.py:473: DeprecationWarning: direct usage of error tracing options has been deprecated, please specify them as trace_errors.option_name instad of directly setting option_name. EXAMPLE: trace_errors.error_email
    "setting option_name. EXAMPLE: trace_errors.error_email", DeprecationWarning)

diff --git a/development.ini b/development.ini
--- a/development.ini
+++ b/development.ini
@@ -303,6 +303,17 @@ beaker.session.secret = development-not-
 #beaker.session.sa.url = postgresql://postgres:qwe@localhost/kallithea
 #beaker.session.table_name = db_session
 
+############################
+## ERROR HANDLING SYSTEMS ##
+############################
+
+# Propagate email settings to ErrorReporter of TurboGears2
+# You do not normally need to change these lines
+get trace_errors.error_email = email_to
+get trace_errors.smtp_server = smtp_server
+get trace_errors.smtp_port = smtp_port
+get trace_errors.from_address = error_email_from
+
 ################################################################################
 ## WARNING: *DEBUG MODE MUST BE OFF IN A PRODUCTION ENVIRONMENT*              ##
 ## Debug mode will enable the interactive debugging tool, allowing ANYONE to  ##
diff --git a/kallithea/lib/paster_commands/template.ini.mako b/kallithea/lib/paster_commands/template.ini.mako
--- a/kallithea/lib/paster_commands/template.ini.mako
+++ b/kallithea/lib/paster_commands/template.ini.mako
@@ -399,7 +399,6 @@ beaker.session.secret = ${uuid()}
 #beaker.session.sa.url = postgresql://postgres:qwe@localhost/kallithea
 #beaker.session.table_name = db_session
 
-%if error_aggregation_service == 'appenlight':
 <%text>############################</%text>
 <%text>## ERROR HANDLING SYSTEMS ##</%text>
 <%text>############################</%text>
@@ -411,6 +410,7 @@ get trace_errors.smtp_server = smtp_serv
 get trace_errors.smtp_port = smtp_port
 get trace_errors.from_address = error_email_from
 
+%if error_aggregation_service == 'appenlight':
 <%text>####################</%text>
 <%text>### [appenlight] ###</%text>
 <%text>####################</%text>