Commit 3f9b100d authored by Bryton Lacquement's avatar Bryton Lacquement 🚪

wip

parent 1fa33a91
...@@ -34,7 +34,7 @@ md5sum = fe6ae121134a0e5bdb060073478be44e ...@@ -34,7 +34,7 @@ md5sum = fe6ae121134a0e5bdb060073478be44e
[template-zope-conf] [template-zope-conf]
filename = zope.conf.in filename = zope.conf.in
md5sum = 14ede94f4e0d146c14e6ecc6b086dac1 md5sum = ff2ed2ecc55a881da1522e3f71eb0f39
[site-zcml] [site-zcml]
filename = site.zcml filename = site.zcml
...@@ -74,7 +74,7 @@ md5sum = d41d8cd98f00b204e9800998ecf8427e ...@@ -74,7 +74,7 @@ md5sum = d41d8cd98f00b204e9800998ecf8427e
[template-erp5] [template-erp5]
filename = instance-erp5.cfg.in filename = instance-erp5.cfg.in
md5sum = c5007595dc58e516f1d43a2d9fd32b7c md5sum = 4257aff0c10ffc05c55aa1131fd47fc8
[template-zeo] [template-zeo]
filename = instance-zeo.cfg.in filename = instance-zeo.cfg.in
...@@ -82,7 +82,7 @@ md5sum = d400c3d449ce437a0ded77ee3d5c5df2 ...@@ -82,7 +82,7 @@ md5sum = d400c3d449ce437a0ded77ee3d5c5df2
[template-zope] [template-zope]
filename = instance-zope.cfg.in filename = instance-zope.cfg.in
md5sum = e3c9c3e28914c8e4d72f5aaf0f8222fe md5sum = 10cad3b6931eef86bf9236c81cd8b75b
[template-balancer] [template-balancer]
filename = instance-balancer.cfg.in filename = instance-balancer.cfg.in
......
...@@ -196,7 +196,7 @@ config-longrequest-logger-timeout = {{ dumps(zope_parameter_dict.get('longreques ...@@ -196,7 +196,7 @@ config-longrequest-logger-timeout = {{ dumps(zope_parameter_dict.get('longreques
config-large-file-threshold = {{ dumps(zope_parameter_dict.get('large-file-threshold', "10MB")) }} config-large-file-threshold = {{ dumps(zope_parameter_dict.get('large-file-threshold', "10MB")) }}
config-port-base = {{ dumps(zope_parameter_dict.get('port-base', 2200)) }} config-port-base = {{ dumps(zope_parameter_dict.get('port-base', 2200)) }}
config-webdav = {{ dumps(zope_parameter_dict.get('webdav', False)) }} config-webdav = {{ dumps(zope_parameter_dict.get('webdav', False)) }}
config-wsgi = {{ dumps(zope_parameter_dict.get('wsgi', False)) }} config-wsgi = {{ dumps(slapparameter_dict.get('wsgi', False)) }}
{% if test_runner_enabled -%} {% if test_runner_enabled -%}
config-test-runner-apache-url-list = ${publish-early:{{ zope_family }}-test-runner-url-list} config-test-runner-apache-url-list = ${publish-early:{{ zope_family }}-test-runner-url-list}
{% endif -%} {% endif -%}
......
{% set wsgi = slapparameter_dict['wsgi'] -%} {% set wsgi = slapparameter_dict['wsgi'] -%}
{% set webdav = slapparameter_dict['webdav'] -%}
{% set use_ipv6 = slapparameter_dict.get('use-ipv6', False) -%} {% set use_ipv6 = slapparameter_dict.get('use-ipv6', False) -%}
{% set next_port = itertools.count(slapparameter_dict['port-base']).next -%} {% set next_port = itertools.count(slapparameter_dict['port-base']).next -%}
{% set site_id = slapparameter_dict['site-id'] -%} {% set site_id = slapparameter_dict['site-id'] -%}
...@@ -220,7 +221,7 @@ pem = {{dumps(storage_dict.pop(k))}} ...@@ -220,7 +221,7 @@ pem = {{dumps(storage_dict.pop(k))}}
<= run-common <= run-common
instance-home = ${directory:instance} instance-home = ${directory:instance}
{% if wsgi -%} {% if wsgi -%}
wrapped-command-line = '{{ bin_directory }}/runwsgi' '${:configuration-file}' wrapped-command-line = '{{ bin_directory }}/runwsgi' {% if webdav -%}-w{%- endif %} {{ ipv4 }}:{{ next_port() }} '${:configuration-file}'
{% else -%} {% else -%}
wrapped-command-line = '{{ bin_directory }}/runzope' -C '${:configuration-file}' wrapped-command-line = '{{ bin_directory }}/runzope' -C '${:configuration-file}'
{%- endif %} {%- endif %}
...@@ -290,7 +291,6 @@ tidstorage-port = {{ dumps(slapparameter_dict['tidstorage-port']) }} ...@@ -290,7 +291,6 @@ tidstorage-port = {{ dumps(slapparameter_dict['tidstorage-port']) }}
{% set thread_amount = slapparameter_dict['thread-amount'] -%} {% set thread_amount = slapparameter_dict['thread-amount'] -%}
{% set large_file_threshold = slapparameter_dict['large-file-threshold'] -%} {% set large_file_threshold = slapparameter_dict['large-file-threshold'] -%}
thread-amount = {{ thread_amount }} thread-amount = {{ thread_amount }}
{% set webdav = slapparameter_dict['webdav'] -%}
webdav = {{ dumps(webdav) }} webdav = {{ dumps(webdav) }}
{% if webdav -%} {% if webdav -%}
{% set timerserver_interval = 0 -%} {% set timerserver_interval = 0 -%}
......
...@@ -28,9 +28,7 @@ products {{ parameter_dict['instance-products'] }} ...@@ -28,9 +28,7 @@ products {{ parameter_dict['instance-products'] }}
force-connection-close off force-connection-close off
</webdav-source-server> </webdav-source-server>
{% else %} {% else %}
{% if parameter_dict['wsgi'] -%} {% if not parameter_dict['wsgi'] -%}
foobarbaz
{% else %}
<http-server> <http-server>
address {{ parameter_dict['ip'] }}:{{ parameter_dict['port'] }} address {{ parameter_dict['ip'] }}:{{ parameter_dict['port'] }}
</http-server> </http-server>
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment