ini: consistently write #-disabled lines without space after # and with single space around =

kallithea/bin/template.ini.mako

@@ -38,8 +38,8 b' threadpool_workers = 5'
 threadpool_max_requests = 10
 <%text>## option to use threads of process</%text>
 use_threadpool = true
-%endif
-%if http_server == 'waitress':
+
+%elif http_server == 'waitress':
 <%text>## WAITRESS ##</%text>
 use = egg:waitress#main
 <%text>## number of worker threads</%text>
@@ -49,8 +49,8 b' max_request_body_size = 107374182400'
 <%text>## use poll instead of select, fixes fd limits, may not work on old</%text>
 <%text>## windows systems.</%text>
 #asyncore_use_poll = True
-%endif
-%if http_server == 'gunicorn':
+
+%elif http_server == 'gunicorn':
 <%text>## GUNICORN ##</%text>
 use = egg:gunicorn#main
 <%text>## number of process workers. You must set `instance_id = *` when this option</%text>
@@ -65,8 +65,8 b' max_requests = 1000'
 <%text>## ammount of time a worker can handle request before it gets killed and</%text>
 <%text>## restarted</%text>
 timeout = 3600
-%endif
-%if http_server == 'uwsgi':
+
+%elif http_server == 'uwsgi':
 <%text>## UWSGI ##</%text>
 <%text>## run with uwsgi --ini-paste-logged <inifile.ini></%text>
 [uwsgi]
@@ -126,6 +126,7 b' workers = 4'
 
 <%text>## how many workers should be spawned at a time</%text>
 cheaper-step = 1
+
 %endif
 <%text>## COMMON ##</%text>
 host = ${host}
@@ -370,7 +371,6 b' beaker.session.auto = False'
 #beaker.session.cookie_expires = 3600
 
 %if error_aggregation_service == 'errormator':
-
 <%text>############################</%text>
 <%text>## ERROR HANDLING SYSTEMS ##</%text>
 <%text>############################</%text>
@@ -429,8 +429,8 b' errormator.request_keys_blacklist ='
 <%text>## can be string with comma separated list of namespaces</%text>
 <%text>## (by default the client ignores own entries: errormator_client.client)</%text>
 errormator.log_namespace_blacklist =
+
 %elif error_aggregation_service == 'sentry':
-
 <%text>################</%text>
 <%text>### [sentry] ###</%text>
 <%text>################</%text>
@@ -448,8 +448,8 b' sentry.project ='
 sentry.site =
 sentry.include_paths =
 sentry.exclude_paths =
+
 %endif
-
 <%text>################################################################################</%text>
 <%text>## WARNING: *THE LINE BELOW MUST BE UNCOMMENTED ON A PRODUCTION ENVIRONMENT*  ##</%text>
 <%text>## Debug mode will enable the interactive debugging tool, allowing ANYONE to  ##</%text>
@@ -472,12 +472,15 b' logview.pylons.util = #eee'
 %if database_engine == 'sqlite':
 # SQLITE [default]
 sqlalchemy.db1.url = sqlite:///${here}/kallithea.db?timeout=60
+
 %elif database_engine == 'postgres':
 # POSTGRESQL
 sqlalchemy.db1.url = postgresql://user:pass@localhost/kallithea
+
 %elif database_engine == 'mysql':
 # MySQL
 sqlalchemy.db1.url = mysql://user:pass@localhost/kallithea
+
 %endif
 # see sqlalchemy docs for others