Commit 3f9893f2 authored by Julien Muchembled's avatar Julien Muchembled

fixup! ERP5: add the ability to run in WSGI mode

parent e7eaedc8
...@@ -86,7 +86,7 @@ md5sum = d400c3d449ce437a0ded77ee3d5c5df2 ...@@ -86,7 +86,7 @@ md5sum = d400c3d449ce437a0ded77ee3d5c5df2
[template-zope] [template-zope]
filename = instance-zope.cfg.in filename = instance-zope.cfg.in
md5sum = db1afd4112782fd9328926a0dc6e41d6 md5sum = 171bc7408e4aee63a5cce0a1da75baf7
[template-balancer] [template-balancer]
filename = instance-balancer.cfg.in filename = instance-balancer.cfg.in
......
...@@ -185,7 +185,7 @@ pem = {{dumps(storage_dict.pop(k))}} ...@@ -185,7 +185,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' {% if webdav %}-w{% endif %} {{ ipv4 }}:{{ next_port() }} '${:configuration-file}' wrapped-command-line = '{{ bin_directory }}/runwsgi' {% if webdav %}-w{% endif %} {{ ipv4 }}:${: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 %}
...@@ -321,6 +321,9 @@ context = ...@@ -321,6 +321,9 @@ context =
< = runzope-base < = runzope-base
wrapper-path = ${directory:service-on-watch}/{{ name }} wrapper-path = ${directory:service-on-watch}/{{ name }}
configuration-file = {{ '${' ~ conf_name ~ ':rendered}' }} configuration-file = {{ '${' ~ conf_name ~ ':rendered}' }}
{%- if wsgi %}
port = {{ port }}
{%- endif %}
[{{ section("promise-" ~ name) }}] [{{ section("promise-" ~ name) }}]
recipe = slapos.cookbook:check_port_listening recipe = slapos.cookbook:check_port_listening
......
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