diff options
Diffstat (limited to 'data/templates/pppoe')
| -rw-r--r-- | data/templates/pppoe/ip-down.script.tmpl | 6 | ||||
| -rw-r--r-- | data/templates/pppoe/peer.tmpl | 4 |
2 files changed, 6 insertions, 4 deletions
diff --git a/data/templates/pppoe/ip-down.script.tmpl b/data/templates/pppoe/ip-down.script.tmpl index 5e119f796..bac4155d6 100644 --- a/data/templates/pppoe/ip-down.script.tmpl +++ b/data/templates/pppoe/ip-down.script.tmpl @@ -23,10 +23,12 @@ if [ -d /sys/class/net/{{ ifname }}/upper_* ]; then VRF_NAME="vrf ${VRF_NAME}" fi -# Always delete default route when interface goes down +{% if default_route != 'none' %} +# Always delete default route when interface goes down if we installed it vtysh -c "conf t" ${VRF_NAME} -c "no ip route 0.0.0.0/0 {{ ifname }} ${VRF_NAME}" -{% 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 %} vtysh -c "conf t" ${VRF_NAME} -c "no ipv6 route ::/0 {{ ifname }} ${VRF_NAME}" +{% endif %} {% endif %} {% endif %} diff --git a/data/templates/pppoe/peer.tmpl b/data/templates/pppoe/peer.tmpl index db2cc6188..0f78f9384 100644 --- a/data/templates/pppoe/peer.tmpl +++ b/data/templates/pppoe/peer.tmpl @@ -47,8 +47,8 @@ mtu {{ mtu }} mru {{ mtu }} {% if authentication is defined %} -{{ "user " + authentication.user if authentication.user is defined }} -{{ "password " + authentication.password if authentication.password is defined }} +{{ 'user "' + authentication.user + '"' if authentication.user is defined }} +{{ 'password "' + authentication.password + '"' if authentication.password is defined }} {% endif %} {{ "usepeerdns" if no_peer_dns is not defined }} |