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/snmp/usr.snmpd.conf.tmpl |  4 ++--
 data/templates/snmp/var.snmpd.conf.tmpl | 14 +++++++-------
 2 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'data/templates/snmp')

diff --git a/data/templates/snmp/usr.snmpd.conf.tmpl b/data/templates/snmp/usr.snmpd.conf.tmpl
index 9c0337fa8..e2c5ec102 100644
--- a/data/templates/snmp/usr.snmpd.conf.tmpl
+++ b/data/templates/snmp/usr.snmpd.conf.tmpl
@@ -1,6 +1,6 @@
 ### Autogenerated by snmp.py ###
-{%- for u in v3_users %}
+{% for u in v3_users %}
 {{ u.mode }}user {{ u.name }}
-{%- endfor %}
+{% endfor %}
 
 rwuser {{ vyos_user }}
diff --git a/data/templates/snmp/var.snmpd.conf.tmpl b/data/templates/snmp/var.snmpd.conf.tmpl
index 6cbc687ef..c779587df 100644
--- a/data/templates/snmp/var.snmpd.conf.tmpl
+++ b/data/templates/snmp/var.snmpd.conf.tmpl
@@ -1,14 +1,14 @@
 ### Autogenerated by snmp.py ###
 # user
-{%- for u in v3_users %}
-{%- if u.authOID == 'none' %}
+{% for u in v3_users %}
+{% if u.authOID == 'none' %}
 createUser {{ u.name }}
-{%- else %}
+{% else %}
 usmUser 1 3 0x{{ v3_engineid }} "{{ u.name }}" "{{ u.name }}" NULL {{ u.authOID }} 0x{{ u.authMasterKey }} {{ u.privOID }} 0x{{ u.privMasterKey }} 0x
-{%- endif %}
-{%- endfor %}
+{% endif %}
+{% endfor %}
 
 createUser {{ vyos_user }} MD5 "{{ vyos_user_pass }}" DES
-{%- if v3_engineid %}
+{% if v3_engineid %}
 oldEngineID 0x{{ v3_engineid }}
-{%- endif %}
+{% endif %}
-- 
cgit v1.2.3