stack/erp5: use runwsgi arguments for thread-amount and large-file-threshold

This needs a recent enough erp5, with the following commit:
zopewsgi: configure threads count and large_file_threshold with argparse

stack/erp5/buildout.hash.cfg

@@ -34,7 +34,7 @@ md5sum = 45cc45510b59ceb730b6e38448b5c0c3
 
 [template-zope-conf]
 filename = zope.conf.in
-md5sum = 65100b158ffdd2a7ff59b011817cdc2f
+md5sum = 828dedaaa1d2007eac6f65cc8009e1fb
 
 [site-zcml]
 filename = site.zcml
@@ -86,7 +86,7 @@ md5sum = 0ac4b74436f554cd677f19275d18d880
 
 [template-zope]
 filename = instance-zope.cfg.in
-md5sum = 66007a42bb4fd8b02dddc0ac25c8897c
+md5sum = c798dece9de7478aebbea4cee244f0c7
 
 [template-balancer]
 filename = instance-balancer.cfg.in

stack/erp5/instance-zope.cfg.in

@@ -255,6 +255,8 @@ wrapped-command-line =
     {{ ipv4 }}:${:port}
     {% if timerserver_interval %}--timerserver-interval={{ timerserver_interval }}{% endif %}
     '${:configuration-file}'
+    --threads={{ thread_amount }}
+    --large-file-threshold={{ slapparameter_dict['large-file-threshold'] }}
 {% else -%}
 wrapped-command-line = '{{ bin_directory }}/runzope' -C '${:configuration-file}'
 {%- endif %}
@@ -302,8 +304,6 @@ tidstorage-ip = {{ dumps(slapparameter_dict['tidstorage-ip']) }}
 tidstorage-port = {{ dumps(slapparameter_dict['tidstorage-port']) }}
 {% endif -%}
 {% set thread_amount = slapparameter_dict['thread-amount'] -%}
-{% set large_file_threshold = slapparameter_dict['large-file-threshold']  -%}
-thread-amount = {{ thread_amount }}
 webdav = {{ dumps(webdav) }}
 wsgi = {{ dumps(wsgi) }}
 timerserver-interval = {{ dumps(timerserver_interval) }}
@@ -349,7 +349,6 @@ node-id = {{ dumps(node_id_base ~ (node_id_index_format % index)) }}
 {% endfor -%}
 import-list = {{ dumps(list(import_set)) }}
 zodb-dict = {{ dumps(zodb_dict) }}
-large-file-threshold = {{ large_file_threshold }}
 {% if longrequest_logger_interval > 0 -%}
 longrequest-logger-file = {{ longrequest_logger_base_path ~ name ~ ".log" }}
 longrequest-logger-timeout = {{ longrequest_logger_timeout }}

stack/erp5/zope.conf.in

@@ -5,7 +5,7 @@
 # too late for some components.
 %define INSTANCE {{ parameter_dict['instance'] }}
 instancehome $INSTANCE
-zserver-threads {{ parameter_dict['thread-amount'] }}
+
 # When ownership checking is enabled, the roles a script runs as are the
 # intersection between user's roles and script owner's roles. This means
 # that revoking a code author's access to the system prevent all scripts
@@ -65,10 +65,6 @@ trusted-proxy 0.0.0.0
 
 {% endif -%}
 
-{% if 'large-file-threshold' in parameter_dict -%}
-large-file-threshold {{ parameter_dict['large-file-threshold'] }}
-
-{% endif -%}
 {% if 'tidstorage-ip' in parameter_dict -%}
 <product-config TIDStorage>
   backend-ip {{ parameter_dict['tidstorage-ip'] }}