netbird/plugins
0
0
Fork 0
mirror of https://github.com/netbirdio/plugins.git synced 2026-05-22 18:44:07 -07:00
Code Issues Packages Projects Releases Wiki Activity

net/haproxy: prefer the static server type, refs #1975

Browse Source 
This could be useful for cases where the migration did not run as expected
and the "type" field is empty. In this case the old behaviour is enforced.

While here, fix indentation of other options.
This commit is contained in:
Frank Wall
2021-03-02 16:33:07 +01:00
parent 7308240cad
commit 3bbf3303ce
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
net/haproxy/src/opnsense/service/templates/OPNsense/HAProxy/haproxy.conf
+7 -7
View File
@@ -1106,11 +1106,11 @@ resolvers {{resolver.id}}
# 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
@@ -1518,10 +1518,10 @@ backend {{backend.name}}
{% else %}
{# # server type #}
{% set server_basics = [] %}
{% if server_data.type|default("") == 'static' %}
{% do server_basics.append('server ' ~ server_data.name ~ ' ' ~ server_data.address) %}
{% else %}
{% if server_data.type|default("") == 'template' %}
{% do server_basics.append('server-template ' ~ server_data.name ~ ' ' ~ server_data.number ~ ' ' ~ server_data.serviceName) %}
{% else %}
{% do server_basics.append('server ' ~ server_data.name ~ ' ' ~ server_data.address) %}
{% endif %}
{# # collect optional server parameters #}
{% set server_options = [] %}