Commit 41533bd0 authored by Rafael Monnerat's avatar Rafael Monnerat

Use haproxy even if schema is http

This is required for squid
parent ec9fc998
...@@ -543,6 +543,7 @@ recipe = slapos.cookbook:logrotate.d ...@@ -543,6 +543,7 @@ recipe = slapos.cookbook:logrotate.d
name = apache-{{ backend_name }} name = apache-{{ backend_name }}
log = ${apache-{{ backend_name }}:error-log} ${apache-{{ backend_name }}:access-log} log = ${apache-{{ backend_name }}:error-log} ${apache-{{ backend_name }}:access-log}
post = {{ bin_directory }}/killpidfromfile ${apache-{{ backend_name }}:pid-file} SIGUSR1 post = {{ bin_directory }}/killpidfromfile ${apache-{{ backend_name }}:pid-file} SIGUSR1
{%- endif %}
[{{ section('haproxy-' ~ backend_name) }}] [{{ section('haproxy-' ~ backend_name) }}]
recipe = slapos.cookbook:haproxy recipe = slapos.cookbook:haproxy
...@@ -556,7 +557,7 @@ wrapper-path = ${directory:services}/haproxy-{{ backend_name }} ...@@ -556,7 +557,7 @@ 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 }} no-timeout = {{ no_timeout }}
{%- endif %}
{% endfor -%} {% endfor -%}
[{{ section('publish-apache-backend-list') }}] [{{ section('publish-apache-backend-list') }}]
recipe = slapos.cookbook:publish recipe = slapos.cookbook:publish
......
...@@ -120,7 +120,7 @@ extra-context = ...@@ -120,7 +120,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 = ddcbec5a02eb3ebcf474dec05bf81d5c md5sum = da0fdf4d18943406061345a2639effd4
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