diff options
Diffstat (limited to 'data')
| -rw-r--r-- | data/templates/iproute2/static.conf.j2 | 2 | ||||
| -rw-r--r-- | data/templates/load-balancing/haproxy.cfg.j2 | 12 |
2 files changed, 13 insertions, 1 deletions
diff --git a/data/templates/iproute2/static.conf.j2 b/data/templates/iproute2/static.conf.j2 index 10c9bdab7..249483ab3 100644 --- a/data/templates/iproute2/static.conf.j2 +++ b/data/templates/iproute2/static.conf.j2 @@ -2,7 +2,7 @@ {% if table is vyos_defined %} {% for t, t_options in table.items() %} {% if t_options.description is vyos_defined %} -{{ "%-6s" | format(t) }} {{ "%-40s" | format(t_options.description) }} +{{ "%-6s" | format(t) }} {{ "%-40s" | format(t_options.description | replace(" ", "_")) }} {% endif %} {% endfor %} {% endif %} diff --git a/data/templates/load-balancing/haproxy.cfg.j2 b/data/templates/load-balancing/haproxy.cfg.j2 index dd93afba5..e8622ba7b 100644 --- a/data/templates/load-balancing/haproxy.cfg.j2 +++ b/data/templates/load-balancing/haproxy.cfg.j2 @@ -69,6 +69,18 @@ frontend {{ front }} {% endif %} {% if front_config.mode is vyos_defined %} mode {{ front_config.mode }} +{% if front_config.tcp_request.inspect_delay is vyos_defined %} + tcp-request inspect-delay {{ front_config.tcp_request.inspect_delay }} +{% endif %} +{# add tcp-request related directive if ssl is configed #} +{% if front_config.mode is vyos_defined('tcp') and front_config.rule is vyos_defined %} +{% for rule, rule_config in front_config.rule.items() %} +{% if rule_config.ssl is vyos_defined %} + tcp-request content accept if { req_ssl_hello_type 1 } +{% break %} +{% endif %} +{% endfor %} +{% endif %} {% endif %} {% if front_config.rule is vyos_defined %} {% for rule, rule_config in front_config.rule.items() %} |