Merge branch 'current' into 2fa

1 files changed, 19 insertions, 15 deletions

diff --git a/data/templates/pppoe/peer.tmpl b/data/templates/pppoe/peer.tmpl
index 0f78f9384..928ed1238 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.
@@ -30,15 +27,21 @@ connect /bin/true
 noauth
 
 # Don't try to proxy ARP for the remote endpoint. User can set proxy
-# arp entries up manually if they wish.  More importantly, having
+# arp entries up manually if they wish. More importantly, having
 # the "proxyarp" parameter set disables the "defaultroute" option.
 noproxyarp
 
 # Unlimited connection attempts
 maxfail 0
 
-plugin rp-pppoe.so
-{{ source_interface }}
+plugin rp-pppoe.so {{ source_interface }}
+{% 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 %}
+
 persist
 ifname {{ ifname }}
 ipparam {{ ifname }}
@@ -54,14 +57,9 @@ mru {{ mtu }}
 {{ "usepeerdns" if no_peer_dns is not defined }}
 
 {% if ipv6 is defined %}
-+ipv6
-{%   if ipv6.address is defined and ipv6.address.autoconf is defined %}
-ipv6cp-use-ipaddr
-{%   endif %}
-{% endif %}
-
-{% if service_name is defined %}
-rp_pppoe_service "{{ service_name }}"
++ipv6 {{ 'ipv6cp-use-ipaddr' if ipv6.address is defined and ipv6.address.autoconf is defined }}
+{% else %}
+noipv6
 {% endif %}
 
 {% if connect_on_demand is defined %}
@@ -71,8 +69,14 @@ demand
 # passed to the ip-up.d/ip-down.s scripts which is required for VRF support.
 {%   if 'auto' in default_route %}
 defaultroute
+{{ 'defaultroute6' if ipv6 is defined }}
 {%   elif 'force' in default_route %}
 defaultroute
 replacedefaultroute
+{{ 'defaultroute6' if ipv6 is defined }}
 {%   endif %}
+{% else %}
+nodefaultroute
+noreplacedefaultroute
+{{ 'nodefaultroute6' if ipv6 is defined }}
 {% endif %}