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 129bd6906..c5da82330 100644 --- a/net/haproxy/src/opnsense/service/templates/OPNsense/HAProxy/haproxy.conf +++ b/net/haproxy/src/opnsense/service/templates/OPNsense/HAProxy/haproxy.conf @@ -695,23 +695,6 @@ backend {{backend.name}} # health checking is DISABLED {% set healthcheck_enabled = '0' %} {% endif %} -{% for server in backend.linkedServers.split(",") %} -{% set server_data = helpers.getUUID(server) %} -{# # collect optional server parameters #} -{% set server_options = [] %} -{# # check if health check is enabled #} -{% if healthcheck_enabled == '1' %} -{% do server_options.append('check') %} -{% do server_options.append('inter ' ~ server_data.checkInterval) %} -{# # add all additions from healthchecks here #} -{% do server_options.append(healthcheck_additions|join(' ')) if healthcheck_additions.length != '0' %} -{% endif %} -{# # server weight #} -{% do server_options.append('weight ' ~ server_data.weight) if server_data.weight|default("") != "" %} -{# # server role/mode #} -{% do server_options.append(server_data.mode) if server_data.mode|default("") != "active" %} - server {{server_data.name}} {{server_data.address}}:{{server_data.port}} {{server_options|join(' ')}} -{% endfor %} {# # XXX: Usually the frontend and the backend are in the same mode, #} {# # but we have no way to know what frontend uses this backend. #} {# # Hence we can't automatically set the mode and thus need a #} @@ -767,6 +750,24 @@ backend {{backend.name}} {% endfor %} {% endif %} +{% for server in backend.linkedServers.split(",") %} +{% set server_data = helpers.getUUID(server) %} +{# # collect optional server parameters #} +{% set server_options = [] %} +{# if# check if health check is enabled #}("") != "" %} +{% if healthcheck_enabled == '1' %} +{% do server_options.append('check') %} +{% do server_options.append('inter ' ~ server_data.checkInterval) %} +{# # add all additions from healthchecks here #} +{% do server_options.append(healthcheck_additions|join(' ')) if healthcheck_additions.length != '0' %} +{% endif %} +{# # server weight #} +{% do server_options.append('weight ' ~ server_data.weight) if server_data.weight|default("") != "" %} +{# # server role/mode #} +{% do server_options.append(server_data.mode) if server_data.mode|default("") != "active" %} + server {{server_data.name}} {{server_data.address}}:{{server_data.port}} {{server_options|join(' ')}} +{% endfor %} + {% else %} # Backend (DISABLED): {{backend.description}}