Commit 878b8ffe authored by Romain Courteaud's avatar Romain Courteaud

Allow to configure backend with less timeout

parent b398f31d
...@@ -368,6 +368,7 @@ context = ...@@ -368,6 +368,7 @@ context =
{% set haproxy_backend_list = [] -%} {% set haproxy_backend_list = [] -%}
{% set longrequest_logger = backend_configuration.get('longrequest-logger') -%} {% set longrequest_logger = backend_configuration.get('longrequest-logger') -%}
{% set http_cache = backend_configuration.get('http-cache', False) -%} {% set http_cache = backend_configuration.get('http-cache', False) -%}
{% set no_timeout = backend_configuration.get('no-timeout', '') -%}
{% for q in range(1, backend_configuration['zopecount'] + 1) -%} {% for q in range(1, backend_configuration['zopecount'] + 1) -%}
{% set part_name = 'zope-%s-%s' % (backend_name, q) -%} {% set part_name = 'zope-%s-%s' % (backend_name, q) -%}
{% if longrequest_logger != None -%} {% if longrequest_logger != None -%}
...@@ -503,6 +504,7 @@ server-check-path = /{{ site_id }}/getId ...@@ -503,6 +504,7 @@ server-check-path = /{{ site_id }}/getId
wrapper-path = ${directory:services}/haproxy-{{ backend_name }} wrapper-path = ${directory:services}/haproxy-{{ backend_name }}
binary-path = {{ parameter_dict['haproxy'] }}/sbin/haproxy binary-path = {{ parameter_dict['haproxy'] }}/sbin/haproxy
backend-list = {{ haproxy_backend_list | join(' ')}} backend-list = {{ haproxy_backend_list | join(' ')}}
no-timeout = {{ no_timeout }}
{%- endif %} {%- endif %}
{% endfor -%} {% endfor -%}
[{{ section('publish-apache-backend-list') }}] [{{ section('publish-apache-backend-list') }}]
......
...@@ -121,7 +121,7 @@ extra-context = ...@@ -121,7 +121,7 @@ extra-context =
[template-tidstorage] [template-tidstorage]
recipe = slapos.recipe.build:download recipe = slapos.recipe.build:download
url = ${:_profile_base_location_}/instance-tidstorage.cfg.in url = ${:_profile_base_location_}/instance-tidstorage.cfg.in
md5sum = 1b85f3acc96f7bc9c699015c7cf4b719 md5sum = c45b6304cfa78c0e677f600bfe34bda3
mode = 640 mode = 640
[template-cloudooo] [template-cloudooo]
......
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