From c87ad948999c28c3c9449f98d60b545481ea29d5 Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Sat, 28 Nov 2020 08:25:39 +0100
Subject: vyos.template: T2720: fix remaining in-line time_block syntax

Commit a2ac9fac ("vyos.template: T2720: always enable Jinja2 trim_blocks
feature") globally enabled the trim_blocks feature. Some templates still used
in-line trim_blocks "{%"- or "-%}" which caused miss-placed line endings.

This is fixed by removing all in-line trim_block statememnts of Jinja2 templates.
---
 data/templates/ids/fastnetmon.tmpl | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'data/templates/ids')

diff --git a/data/templates/ids/fastnetmon.tmpl b/data/templates/ids/fastnetmon.tmpl
index 71a1b2bd7..1f6a1c808 100644
--- a/data/templates/ids/fastnetmon.tmpl
+++ b/data/templates/ids/fastnetmon.tmpl
@@ -27,34 +27,34 @@ enable_subnet_counters = off
 
 {% if "mirror" in mode %}
 mirror_afpacket = on
-{% endif -%}
+{% endif %}
 
 {% if "in" in direction %}
 process_incoming_traffic = on
-{% endif -%}
+{% endif %}
 {% if "out" in direction %}
 process_outgoing_traffic = on
-{% endif -%}
+{% endif %}
 {% for th in threshold %}
 {% if th == "fps" %}
 ban_for_flows = on
 threshold_flows = {{ threshold[th] }}
-{% endif -%}
+{% endif %}
 {% if th == "mbps" %}
 ban_for_bandwidth = on
 threshold_mbps = {{ threshold[th] }}
-{% endif -%}
+{% endif %}
 {% if th == "pps" %}
 ban_for_pps = on
 threshold_pps = {{ threshold[th] }}
-{% endif -%}
-{% endfor -%}
+{% endif %}
+{% endfor %}
 
 {% if listen_interface %}
 {% set value = listen_interface if listen_interface is string else listen_interface | join(',') %}
 interfaces = {{ value }}
-{% endif -%}
+{% endif %}
 
 {% if alert_script %}
 notify_script_path = {{ alert_script }}
-{% endif -%}
+{% endif %}
-- 
cgit v1.2.3