From f39b0c1648c227ce2984d3851921416a5f49b53e Mon Sep 17 00:00:00 2001
From: Frank Wall <fw@moov.de>
Date: Sun, 21 Feb 2021 23:50:00 +0100
Subject: [PATCH] net/haproxy: ignore mailers that are not in use, refs #1669

---
 .../templates/OPNsense/HAProxy/haproxy.conf   | 24 +++++++++++++++----
 1 file changed, 20 insertions(+), 4 deletions(-)

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 c0d06021a..091d1d4d0 100644
--- a/net/haproxy/src/opnsense/service/templates/OPNsense/HAProxy/haproxy.conf
+++ b/net/haproxy/src/opnsense/service/templates/OPNsense/HAProxy/haproxy.conf
@@ -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}}