From 41533bd089ab40f6f326a0b452b4326ab43ec511 Mon Sep 17 00:00:00 2001
From: Rafael Monnerat <rafael@nexedi.com>
Date: Wed, 24 Oct 2012 21:53:17 -0200
Subject: [PATCH] Use haproxy even if schema is http

This is required for squid
---
 software/erp5/instance-tidstorage.cfg.in | 3 ++-
 software/erp5/software.cfg               | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/software/erp5/instance-tidstorage.cfg.in b/software/erp5/instance-tidstorage.cfg.in
index 977e6966d..d1147ac39 100644
--- a/software/erp5/instance-tidstorage.cfg.in
+++ b/software/erp5/instance-tidstorage.cfg.in
@@ -543,6 +543,7 @@ recipe = slapos.cookbook:logrotate.d
 name = apache-{{ backend_name }}
 log = ${apache-{{ backend_name }}:error-log} ${apache-{{ backend_name }}:access-log}
 post = {{ bin_directory }}/killpidfromfile ${apache-{{ backend_name }}:pid-file} SIGUSR1
+{%-  endif %}
 
 [{{ section('haproxy-' ~ backend_name) }}]
 recipe = slapos.cookbook:haproxy
@@ -556,7 +557,7 @@ wrapper-path = ${directory:services}/haproxy-{{ backend_name }}
 binary-path = {{ parameter_dict['haproxy'] }}/sbin/haproxy
 backend-list = {{ haproxy_backend_list | join(' ')}}
 no-timeout = {{ no_timeout }}
-{%-  endif %}
+
 {% endfor -%}
 [{{ section('publish-apache-backend-list') }}]
 recipe = slapos.cookbook:publish
diff --git a/software/erp5/software.cfg b/software/erp5/software.cfg
index 0247cfe6e..c49386467 100644
--- a/software/erp5/software.cfg
+++ b/software/erp5/software.cfg
@@ -120,7 +120,7 @@ extra-context =
 [template-tidstorage]
 recipe = slapos.recipe.build:download
 url = ${:_profile_base_location_}/instance-tidstorage.cfg.in
-md5sum = ddcbec5a02eb3ebcf474dec05bf81d5c 
+md5sum = da0fdf4d18943406061345a2639effd4
 mode = 640
 
 [template-cloudooo]
-- 
2.30.9