Merge pull request #2302 from fraenki/haproxy_320

net/haproxy: release 3.2
This commit is contained in:
Frank Wall
2021-04-14 23:53:22 +02:00
committed by GitHub
3 changed files with 19 additions and 3 deletions
+1 -1
View File
@@ -1,5 +1,5 @@
PLUGIN_NAME= haproxy
PLUGIN_VERSION= 3.1
PLUGIN_VERSION= 3.2
PLUGIN_COMMENT= Reliable, high performance TCP/HTTP load balancer
PLUGIN_DEPENDS= haproxy
PLUGIN_MAINTAINER= opnsense@moov.de
+8
View File
@@ -6,6 +6,14 @@ very high loads while needing persistence or Layer7 processing.
Plugin Changelog
================
3.2
Fixed:
* fix config test when HAProxy service is not enabled
Changed:
* ignore incompatible ciphersuites options when LibreSSL is used (#2013)
3.1
Fixed:
@@ -829,7 +829,7 @@ userlist {{object.name | regex_replace ("[^A-Za-z0-9]","")}}
#
# NOTE: HAProxy is currently DISABLED
#
{%- endif -%}
{% endif %}
{#- ############################### -#}
{#- GLOBAL -#}
@@ -926,7 +926,11 @@ global
ssl-default-bind-ciphers {{ OPNsense.HAProxy.general.tuning.ssl_cipherList }}
{% endif %}
{% if OPNsense.HAProxy.general.tuning.ssl_cipherSuites|default("") != "" %}
{% if helpers.exists('system.firmware.flavour') and not(helpers.empty('system.firmware.flavour')) and system.firmware.flavour|default('') == 'libressl' %}
# WARNING: ssl-default-bind-ciphersuites cannot be used with flavour {{ system.firmware.flavour}}.
{% else %}
ssl-default-bind-ciphersuites {{ OPNsense.HAProxy.general.tuning.ssl_cipherSuites }}
{% endif %}
{% endif %}
{% endif %}
{# # pass-through options #}
@@ -1162,7 +1166,11 @@ frontend {{frontend.name}}
{% do ssl_options.append('ciphers ' ~ frontend.ssl_cipherList) %}
{% endif %}
{% if frontend.ssl_cipherSuites|default("") != "" %}
{% do ssl_options.append('ciphersuites ' ~ frontend.ssl_cipherSuites) %}
{% if helpers.exists('system.firmware.flavour') and not(helpers.empty('system.firmware.flavour')) and system.firmware.flavour|default('') == 'libressl' %}
# WARNING: ciphersuites cannot be used with flavour {{ system.firmware.flavour}}.
{% else %}
{% do ssl_options.append('ciphersuites ' ~ frontend.ssl_cipherSuites) %}
{% endif %}
{% endif %}
{# # HSTS #}
{% if frontend.ssl_hstsEnabled|default("") == '1' and frontend.mode == 'http' %}