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/pppoe/ip-pre-up.script.tmpl | 2 +-
 data/templates/pppoe/ip-up.script.tmpl     | 6 +++---
 data/templates/pppoe/ipv6-up.script.tmpl   | 8 ++++----
 data/templates/pppoe/peer.tmpl             | 8 ++++----
 4 files changed, 12 insertions(+), 12 deletions(-)

(limited to 'data/templates/pppoe')

diff --git a/data/templates/pppoe/ip-pre-up.script.tmpl b/data/templates/pppoe/ip-pre-up.script.tmpl
index cf85ed067..a54e4e9bd 100644
--- a/data/templates/pppoe/ip-pre-up.script.tmpl
+++ b/data/templates/pppoe/ip-pre-up.script.tmpl
@@ -12,7 +12,7 @@ logger -t pppd[$DIALER_PID] "executing $0"
 
 echo "{{ description }}" > /sys/class/net/{{ ifname }}/ifalias
 
-{% if vrf -%}
+{% if vrf %}
 logger -t pppd[$DIALER_PID] "configuring dialer interface $6 for VRF {{ vrf }}"
 ip link set dev {{ ifname }} master {{ vrf }}
 {% endif %}
diff --git a/data/templates/pppoe/ip-up.script.tmpl b/data/templates/pppoe/ip-up.script.tmpl
index 568e21c4e..302756960 100644
--- a/data/templates/pppoe/ip-up.script.tmpl
+++ b/data/templates/pppoe/ip-up.script.tmpl
@@ -11,7 +11,7 @@ fi
 DIALER_PID=$(cat /var/run/{{ ifname }}.pid)
 logger -t pppd[$DIALER_PID] "executing $0"
 
-{%   if default_route != 'none' -%}
+{%   if default_route != 'none' %}
 # See https://phabricator.vyos.net/T2248 & T2220. Determine if we are enslaved
 # to a VRF, this is needed to properly insert the default route.
 
@@ -28,14 +28,14 @@ if [ -d /sys/class/net/{{ ifname }}/upper_* ]; then
     VRF_NAME="vrf ${VRF}"
 fi
 
-{%     if default_route == 'auto' -%}
+{%     if default_route == 'auto' %}
 # Only insert a new default route if there is no default route configured
 routes=$(vtysh -c "show running-config" | sed -n "/${SED_OPT}/,/!/p" | grep 0.0.0.0/0 | wc -l)
 if [ "$routes" -ne 0 ]; then
     exit 1
 fi
 
-{%     elif default_route == 'force' -%}
+{%     elif default_route == 'force' %}
 # Retrieve current static default routes and remove it from the routing table
 vtysh -c "show running-config" | sed -n "/${SED_OPT}/,/!/p" | grep 0.0.0.0/0 | while read route ; do
     vtysh -c "conf t" ${VTY_OPT} -c "no ${route} ${VRF_NAME}"
diff --git a/data/templates/pppoe/ipv6-up.script.tmpl b/data/templates/pppoe/ipv6-up.script.tmpl
index d0a62478c..ed6102d6c 100644
--- a/data/templates/pppoe/ipv6-up.script.tmpl
+++ b/data/templates/pppoe/ipv6-up.script.tmpl
@@ -7,7 +7,7 @@ if [ "$6" != "{{ ifname }}" ]; then
     exit
 fi
 
-{% if ipv6 is defined and ipv6.address is defined and ipv6.address.autoconf is defined -%}
+{% if ipv6 is defined and ipv6.address is defined and ipv6.address.autoconf is defined %}
 # add some info to syslog
 DIALER_PID=$(cat /var/run/{{ ifname }}.pid)
 logger -t pppd[$DIALER_PID] "executing $0"
@@ -45,7 +45,7 @@ echo 1 > /proc/sys/net/ipv6/conf/{{ ifname }}/autoconf
 systemctl start dhcp6c@{{ ifname }}.service
 {% endif %}
 
-{% if default_route != 'none' -%}
+{% if default_route != 'none' %}
 # See https://phabricator.vyos.net/T2248 & T2220. Determine if we are enslaved
 # to a VRF, this is needed to properly insert the default route.
 
@@ -62,14 +62,14 @@ if [ -d /sys/class/net/{{ ifname }}/upper_* ]; then
     VRF_NAME="vrf ${VRF}"
 fi
 
-{%   if default_route == 'auto' -%}
+{%   if default_route == 'auto' %}
 # Only insert a new default route if there is no default route configured
 routes=$(vtysh -c "show running-config" | sed -n "/${SED_OPT}/,/!/p" | grep ::/0 | wc -l)
 if [ "$routes" -ne 0 ]; then
     exit 1
 fi
 
-{%   elif default_route == 'force' -%}
+{%   elif default_route == 'force' %}
 # Retrieve current static default routes and remove it from the routing table
 vtysh -c "show running-config" | sed -n "/${SED_OPT}/,/!/p" | grep ::/0 | while read route ; do
     vtysh -c "conf t" ${VTY_OPT} -c "no ${route} ${VRF_NAME}"
diff --git a/data/templates/pppoe/peer.tmpl b/data/templates/pppoe/peer.tmpl
index e909843a5..dd4272a98 100644
--- a/data/templates/pppoe/peer.tmpl
+++ b/data/templates/pppoe/peer.tmpl
@@ -53,12 +53,12 @@ mru {{ mtu }}
 
 {{ "usepeerdns" if no_peer_dns is not defined }}
 
-{% if ipv6 is defined and ipv6.enable is defined -%}
+{% if ipv6 is defined and ipv6.enable is defined %}
 +ipv6
 ipv6cp-use-ipaddr
 {% endif %}
 
-{% if service_name is defined -%}
+{% if service_name is defined %}
 rp_pppoe_service "{{ service_name }}"
 {% endif %}
 
@@ -67,9 +67,9 @@ demand
 # See T2249. PPP default route options should only be set when in on-demand
 # mode. As soon as we are not in on-demand mode the default-route handling is
 # passed to the ip-up.d/ip-down.s scripts which is required for VRF support.
-{%   if 'auto' in default_route -%}
+{%   if 'auto' in default_route %}
 defaultroute
-{%   elif 'force' in default_route -%}
+{%   elif 'force' in default_route %}
 defaultroute
 replacedefaultroute
 {%   endif %}
-- 
cgit v1.2.3