diff options
| author | Christian Poessinger <christian@poessinger.com> | 2020-11-28 08:25:39 +0100 |
|---|---|---|
| committer | Christian Poessinger <christian@poessinger.com> | 2020-11-28 08:25:39 +0100 |
| commit | c87ad948999c28c3c9449f98d60b545481ea29d5 (patch) | |
| tree | 18b188cf73266be95c62f128afe5d155a7a03bf4 /data/templates/pppoe/peer.tmpl | |
| parent | 41f79409c742b6a020318b196cbaa52439845d6d (diff) | |
| download | vyos-1x-c87ad948999c28c3c9449f98d60b545481ea29d5.tar.gz vyos-1x-c87ad948999c28c3c9449f98d60b545481ea29d5.zip | |
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.
Diffstat (limited to 'data/templates/pppoe/peer.tmpl')
| -rw-r--r-- | data/templates/pppoe/peer.tmpl | 8 |
1 files changed, 4 insertions, 4 deletions
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 %} |