diff options
author | Christian Poessinger <christian@poessinger.com> | 2021-08-21 11:35:07 +0200 |
---|---|---|
committer | Christian Poessinger <christian@poessinger.com> | 2021-08-22 09:56:09 +0200 |
commit | ac89b13201ae4943a33b1f400e94a3d817a2ec0b (patch) | |
tree | 8fc4e4c3695bed114ea4e546d90dc31b42ae759d /data/templates | |
parent | 281274de1e20e1f937e92960bfd72d3d608e75f3 (diff) | |
download | vyos-1x-ac89b13201ae4943a33b1f400e94a3d817a2ec0b.tar.gz vyos-1x-ac89b13201ae4943a33b1f400e94a3d817a2ec0b.zip |
pppoe: T1318: implement missing access-concentrator CLI option
(cherry picked from commit b121ee14ff1961b56568b0116de3c246ea4af934)
Diffstat (limited to 'data/templates')
-rw-r--r-- | data/templates/pppoe/peer.tmpl | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/data/templates/pppoe/peer.tmpl b/data/templates/pppoe/peer.tmpl index 0f78f9384..818f40745 100644 --- a/data/templates/pppoe/peer.tmpl +++ b/data/templates/pppoe/peer.tmpl @@ -1,8 +1,5 @@ ### Autogenerated by interfaces-pppoe.py ### - -{% if description %} -# {{ description }} -{% endif %} +{{ '# ' ~ description if description is defined else '' }} # Require peer to provide the local IP address if it is not # specified explicitly in the config file. @@ -38,6 +35,13 @@ noproxyarp maxfail 0 plugin rp-pppoe.so +{% if access_concentrator is defined and access_concentrator is not none %} +rp_pppoe_ac '{{ access_concentrator }}' +{% endif %} +{% if service_name is defined and service_name is not none %} +rp_pppoe_service '{{ service_name }}' +{% endif %} + {{ source_interface }} persist ifname {{ ifname }} @@ -60,10 +64,6 @@ ipv6cp-use-ipaddr {% endif %} {% endif %} -{% if service_name is defined %} -rp_pppoe_service "{{ service_name }}" -{% endif %} - {% if connect_on_demand is defined %} demand # See T2249. PPP default route options should only be set when in on-demand |