net/haproxy: ignore mailers that are not in use, refs #1669

This commit is contained in:
Frank Wall
2021-02-23 17:11:10 +01:00
parent 1f07481bc3
commit f39b0c1648
@@ -1091,15 +1091,31 @@ resolvers {{resolver.id}}
{% if helpers.exists('OPNsense.HAProxy.mailers') %}
{% for mailer in helpers.toList('OPNsense.HAProxy.mailers.mailer') %}
{% if mailer.enabled == '1' %}
{# # check if mailer is configured in a backend #}
{% set ns = namespace(mailer_found=false) %}
{% if helpers.exists('OPNsense.HAProxy.backends') %}
{% for backend in helpers.toList('OPNsense.HAProxy.backends.backend') %}
{# # backend must be enabled #}
{% if backend.enabled == '1' and backend.linkedMailer|default('') == mailer['@uuid'] %}
{% set ns.mailer_found = True %}
{% endif %}
{% endfor %}
{% endif %}
{# # only add mailers that are in use to avoid config test warnings #}
{% if ns.mailer_found %}
# Mailer: {{mailer.name}}
mailers {{mailer.id}}
timeout mail {{mailer.timeout}}s
{% if mailer.mailservers|default("") != "" %}
{% for mailserver in mailer.mailservers.split(",") %}
{% if mailer.mailservers|default("") != "" %}
{% for mailserver in mailer.mailservers.split(",") %}
mailer {{mailserver}} {{mailserver}}
{% endfor %}
{% endif %}
{% endfor %}
{% endif %}
{% else %}
# NOTE: Mailer {{mailer.name}} ignored: not configured in any backend
{% endif %}
{% else %}
# Mailer (DISABLED): {{mailer.name}}