config: tweak template http_server conditionals - don't leave an empty section when using UWSGI

The web servers run by 'gearbox serve' share the same basic configuration:

  [server:main]
  host = ...
  port = ...
  use = egg:...
  ...

UWSGI doesn't use gearbox and doesn't use a [server:main] section but will read
it's own section:

  [uwsgi]
  http = ...:...
  ...

Before, 'make-config my.ini http_server=uwsgi' would create an empty
[server:main] section, and only after 6a5fb5070765 it stopped putting unused
host/port information there.

Now, let everything but UWSGI share the [server:main] template section and put
host/port first. Everything UWSGI is handled in its own conditional template
section.

development.ini

@@ -60,7 +60,12 b' smtp_port ='
 #smtp_use_ssl = false
 #smtp_use_tls = false
 
+## Entry point for 'gearbox serve'
 [server:main]
+#host = 127.0.0.1
+host = 0.0.0.0
+port = 5000
+
 ## WAITRESS ##
 use = egg:waitress#main
 ## number of worker threads
@@ -71,11 +76,6 b' max_request_body_size = 107374182400'
 ## windows systems.
 #asyncore_use_poll = True
 
-## COMMON ##
-#host = 127.0.0.1
-host = 0.0.0.0
-port = 5000
-
 ## middleware for hosting the WSGI application under a URL prefix
 #[filter:proxy-prefix]
 #use = egg:PasteDeploy#prefix

kallithea/lib/paster_commands/template.ini.mako

@@ -61,7 +61,12 b' smtp_port ='
 #smtp_use_ssl = false
 #smtp_use_tls = false
 
+%if http_server != 'uwsgi':
+<%text>## Entry point for 'gearbox serve'</%text>
 [server:main]
+host = ${host}
+port = ${port}
+
 %if http_server == 'gearbox':
 <%text>## Gearbox default web server ##</%text>
 use = egg:gearbox#wsgiref
@@ -103,7 +108,8 b' max_requests = 1000'
 <%text>## restarted</%text>
 timeout = 3600
 
-%elif http_server == 'uwsgi':
+%endif
+%else:
 <%text>## UWSGI ##</%text>
 <%text>## run with uwsgi --ini-paste-logged <inifile.ini></%text>
 [uwsgi]
@@ -165,11 +171,6 b' workers = 4'
 cheaper-step = 1
 
 %endif
-%if http_server != 'uwsgi':
-host = ${host}
-port = ${port}
-
-%endif
 <%text>## middleware for hosting the WSGI application under a URL prefix</%text>
 #[filter:proxy-prefix]
 #use = egg:PasteDeploy#prefix