From 28b437c8242aa5f2ef2df727e86b4fc947156870 Mon Sep 17 00:00:00 2001
From: jurgenhaas <juergen@paragon-es.de>
Date: Sun, 2 Sep 2018 09:05:16 +0200
Subject: [PATCH] ansible-inventories/alphabet#2885 Only send public asset
requests to Varnish, even if bigpipe support is enabled
---
templates/haproxy_cfg.jinja2 | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/templates/haproxy_cfg.jinja2 b/templates/haproxy_cfg.jinja2
index 1d98090..9f8559e 100644
--- a/templates/haproxy_cfg.jinja2
+++ b/templates/haproxy_cfg.jinja2
@@ -165,9 +165,9 @@ frontend http_in
acl is_ban method BAN
use_backend backend_varnish if is_ban
acl domain_ignores_varnish hdr(host) -i -n -f /etc/haproxy/ignore_varnish.list
- use_backend backend_varnish_bigpipe if domain_uses_bigpipe !domain_ignores_varnish
acl static_content path_end .jpg .jpeg .gif .png .ico .swf .css .js .htm .html .ttf .woff .woff2 .svg .eot
acl static_content_private path_beg /system/
+ use_backend backend_varnish_bigpipe if static_content !static_content_private domain_uses_bigpipe !domain_ignores_varnish
use_backend backend_varnish if static_content !static_content_private !domain_ignores_varnish
{% endif %}
{% if 'webserver' in groups %}
@@ -298,9 +298,9 @@ frontend https_in_{{ cert.ip }}
acl domain_uses_bigpipe hdr(host) -i -n -f /etc/haproxy/use_bigpipe.list
{% if varnish_host|default(false) %}
acl domain_ignores_varnish hdr(host) -i -n -f /etc/haproxy/ignore_varnish.list
- use_backend backend_varnish_bigpipe if domain_uses_bigpipe !domain_ignores_varnish
acl static_content path_end .jpg .jpeg .gif .png .ico .swf .css .js .htm .html .ttf .woff .woff2 .svg .eot
acl static_content_private path_beg /system/
+ use_backend backend_varnish_bigpipe if static_content !static_content_private domain_uses_bigpipe !domain_ignores_varnish
use_backend backend_varnish if static_content !static_content_private !domain_ignores_varnish
{% endif %}
{% if 'webserver' in groups %}
--
GitLab