From 833b09950cfb15a4a730a27f981fc52e0259d90c Mon Sep 17 00:00:00 2001 From: Frank Wall Date: Mon, 12 Aug 2019 22:47:05 +0200 Subject: [PATCH 1/2] net/haproxy: fix syntax error in template, refs #1442 --- .../opnsense/service/templates/OPNsense/HAProxy/haproxy.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/haproxy/src/opnsense/service/templates/OPNsense/HAProxy/haproxy.conf b/net/haproxy/src/opnsense/service/templates/OPNsense/HAProxy/haproxy.conf index 39893f123..c606f3a6c 100644 --- a/net/haproxy/src/opnsense/service/templates/OPNsense/HAProxy/haproxy.conf +++ b/net/haproxy/src/opnsense/service/templates/OPNsense/HAProxy/haproxy.conf @@ -1304,7 +1304,7 @@ backend {{backend.name}} {% if backend.tuning_httpreuse|default("") != "" and backend.mode == "http" %} http-reuse {{backend.tuning_httpreuse}} {% endif %} -{% if helpers.exists('OPNsense.HAProxy.general.cache') and OPNsense.HAProxy.general.cache.enabled|default("") == "1" and if backend.tuning_caching|default("") == "1" and backend.mode == "http" %} +{% if helpers.exists('OPNsense.HAProxy.general.cache') and OPNsense.HAProxy.general.cache.enabled|default("") == "1" and backend.tuning_caching|default("") == "1" and backend.mode == "http" %} http-request cache-use opnsense-haproxy-cache http-response cache-store opnsense-haproxy-cache {% endif %} From ef164f1e147b460931bfa644d3eb1e54ecb64c41 Mon Sep 17 00:00:00 2001 From: Frank Wall Date: Mon, 12 Aug 2019 22:52:01 +0200 Subject: [PATCH 2/2] net/haproxy: bump version --- net/haproxy/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/haproxy/Makefile b/net/haproxy/Makefile index 475c2897a..a141ed555 100644 --- a/net/haproxy/Makefile +++ b/net/haproxy/Makefile @@ -1,5 +1,5 @@ PLUGIN_NAME= haproxy -PLUGIN_VERSION= 2.17 +PLUGIN_VERSION= 2.18 PLUGIN_COMMENT= Reliable, high performance TCP/HTTP load balancer PLUGIN_DEPENDS= haproxy18 PLUGIN_MAINTAINER= opnsense@moov.de