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/vyos-hostsd/hosts.tmpl | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'data/templates/vyos-hostsd')

diff --git a/data/templates/vyos-hostsd/hosts.tmpl b/data/templates/vyos-hostsd/hosts.tmpl
index 566f9a5dd..be8692104 100644
--- a/data/templates/vyos-hostsd/hosts.tmpl
+++ b/data/templates/vyos-hostsd/hosts.tmpl
@@ -12,15 +12,15 @@ ff00::0         ip6-mcastprefix
 ff02::1         ip6-allnodes
 ff02::2         ip6-allrouters
 
-{% if hosts -%}
+{% if hosts %}
 # From 'system static-host-mapping' and DHCP server
-{%- for tag, taghosts in hosts.items() %}
+{% for tag, taghosts in hosts.items() %}
 # {{ tag }}
-{%- for host, hostprops in taghosts.items() %}
-{%- if hostprops['address'] %}
+{% for host, hostprops in taghosts.items() %}
+{% if hostprops['address'] %}
 {{ hostprops['address'] }}	{{ host }}{% for a in hostprops['aliases'] %} {{ a }}{% endfor %}
-{%- endif %}
-{%- endfor %}
-{%- endfor %}
-{%- endif %}
+{% endif %}
+{% endfor %}
+{% endfor %}
+{% endif %}
 
-- 
cgit v1.2.3