stack/erp5,software/slapos-master: remove unused traces of wsgi parameter

This parameter no longer exists, this was not removed correctly

software/slapos-master/buildout.hash.cfg

@@ -14,7 +14,7 @@
 # not need these here).
 [template-erp5]
 filename = instance-erp5.cfg.in
-md5sum = 6db19ee819a960a34012308e29c5bbfb
+md5sum = 15744bc9aa87585a64cb0050263e3142
 
 [template-balancer]
 filename = instance-balancer.cfg.in

software/slapos-master/instance-erp5.cfg.in

@@ -258,7 +258,6 @@ config-smtp-url = ${request-smtp:connection-url}
 config-timezone = {{ dumps(slapparameter_dict.get('timezone', 'UTC')) }}
 config-cloudooo-retry-count = {{ slapparameter_dict.get('cloudooo-retry-count', 2) }}
 config-wendelin-core-zblk-fmt = {{ dumps(slapparameter_dict.get('wendelin-core-zblk-fmt', '')) }}
-config-wsgi = {{ dumps(slapparameter_dict.get('wsgi', True)) }}
 config-test-runner-enabled = {{ dumps(test_runner_enabled) }}
 config-test-runner-node-count = {{ dumps(test_runner_node_count) }}
 config-test-runner-random-activity-priority = {{ dumps(test_runner_random_activity_priority) }}

stack/erp5/buildout.hash.cfg

@@ -74,7 +74,7 @@ md5sum = ca0cb83950dd9079cc289891cce08e76
 
 [template-erp5]
 filename = instance-erp5.cfg.in
-md5sum = 07012cab8738836bb315f61bcc09c0c3
+md5sum = 7318eb93f1abf4c07a54b89e4a710fa6
 
 [template-zeo]
 filename = instance-zeo.cfg.in

stack/erp5/instance-erp5.cfg.in

@@ -252,7 +252,6 @@ config-smtp-url = ${request-smtp:connection-url}
 config-timezone = {{ dumps(slapparameter_dict.get('timezone', 'UTC')) }}
 config-cloudooo-retry-count = {{ slapparameter_dict.get('cloudooo-retry-count', 2) }}
 config-wendelin-core-zblk-fmt = {{ dumps(slapparameter_dict.get('wendelin-core-zblk-fmt', '')) }}
-config-wsgi = {{ dumps(slapparameter_dict.get('wsgi', True)) }}
 config-test-runner-enabled = {{ dumps(test_runner_enabled) }}
 config-test-runner-node-count = {{ dumps(test_runner_node_count) }}
 config-test-runner-random-activity-priority = {{ dumps(test_runner_random_activity_priority) }}

[Rafael Monnerat]

@jerome Isn't better remove waitress and all code related to wsqi all along?

[Rafael Monnerat]

Sample:

stack/erp5/buildout.cfg:# with-max-rlimit-nofile option of zopewsgi is disabled in ERP5
stack/erp5/buildout.cfg:  runwsgi=Products.ERP5.bin.zopewsgi:runwsgi
stack/erp5/buildout.cfg:  runwsgi
stack/erp5/instance-zope.cfg.in:  '{{ bin_directory }}/runwsgi'

... and also remove the suport from erp5 bin...

[Jérome Perrin]

waitress / wsgi is the default since a few years. We use to have this option which allowed us to set wsgi=False and use ZServer instead. Nowadays we no longer have this option, only wsgi/waitress is used (ZServer does not support python3)