summaryrefslogtreecommitdiff
path: root/docs/configuration
diff options
context:
space:
mode:
Diffstat (limited to 'docs/configuration')
-rw-r--r--docs/configuration/interfaces/pppoe.rst17
-rw-r--r--docs/configuration/policy/route-map.rst10
-rw-r--r--docs/configuration/service/router-advert.rst2
3 files changed, 15 insertions, 14 deletions
diff --git a/docs/configuration/interfaces/pppoe.rst b/docs/configuration/interfaces/pppoe.rst
index e1bb3056..dbf92caf 100644
--- a/docs/configuration/interfaces/pppoe.rst
+++ b/docs/configuration/interfaces/pppoe.rst
@@ -1,4 +1,4 @@
-:lastproofread: 2021-07-09
+:lastproofread: 2022-07-27
.. _pppoe-interface:
@@ -126,6 +126,9 @@ PPPoE options
set interfaces pppoe pppoe0 no-default-route
+ .. note:: This command got added in VyOS 1.4 and inverts the logic from the old
+ ``default-route`` CLI option.
+
.. cfgcmd:: set interfaces pppoe <interface> default-route-distance <distance>
Set the distance for the default gateway sent by the PPPoE server.
@@ -310,11 +313,6 @@ Requirements:
If you are switching from a DHCP based ISP like cable then be aware that
things like VPN links may need to have their MTU sizes adjusted to work
within this limit.
-* With the ``default-route`` option set to ``auto``, VyOS will only add the
- default gateway you receive from your DSL ISP to the routing table if you
- have no other WAN connections. If you wish to use a dual WAN connection,
- change the ``default-route`` option to ``force``. You could also install
- a static route and set the ``default-route`` option to ``none``.
* With the ``name-server`` option set to ``none``, VyOS will ignore the
nameservers your ISP sends you and thus you can fully rely on the ones you
have configured statically.
@@ -322,10 +320,11 @@ Requirements:
.. note:: Syntax has changed from VyOS 1.2 (crux) and it will be automatically
migrated during an upgrade.
+.. note:: A default route is automatically installed once the interface is up.
+ To change this behavior use the ``no-default-route`` CLI option.
+
.. code-block:: none
- set interfaces pppoe pppoe0 default-route 'auto'
- set interfaces pppoe pppoe0 mtu 1492
set interfaces pppoe pppoe0 authentication user 'userid'
set interfaces pppoe pppoe0 authentication password 'secret'
set interfaces pppoe pppoe0 source-interface 'eth0'
@@ -351,8 +350,6 @@ which is the default VLAN for Deutsche Telekom:
.. code-block:: none
- set interfaces pppoe pppoe0 default-route 'auto'
- set interfaces pppoe pppoe0 mtu 1492
set interfaces pppoe pppoe0 authentication user 'userid'
set interfaces pppoe pppoe0 authentication password 'secret'
set interfaces pppoe pppoe0 source-interface 'eth0.7'
diff --git a/docs/configuration/policy/route-map.rst b/docs/configuration/policy/route-map.rst
index 97fa1102..7743b14b 100644
--- a/docs/configuration/policy/route-map.rst
+++ b/docs/configuration/policy/route-map.rst
@@ -73,8 +73,9 @@ Route Map
prefix-len <0-32>
IP address of route to match, based on specified prefix-length.
- Note that this does not work with BGP routes.
- When applied to BGP it can lead to unexpected results.
+ Note that this can be used for kernel routes only.
+ Do not apply to the routes of dynamic routing protocols (e.g. BGP,
+ RIP, OSFP), as this can lead to unexpected results..
.. cfgcmd:: set policy route-map <text> rule <1-65535> match ip nexthop
access-list <1-2699>
@@ -125,8 +126,9 @@ Route Map
prefix-len <0-128>
IPv6 address of route to match, based on specified prefix-length.
- Note that this match rule does not work with BGP routes.
- When applied to BGP it can lead to unexpected results.
+ Note that this can be used for kernel routes only.
+ Do not apply to the routes of dynamic routing protocols (e.g. BGP,
+ RIP, OSFP), as this can lead to unexpected results..
.. cfgcmd:: set policy route-map <text> rule <1-65535> match ipv6 nexthop
<h:h:h:h:h:h:h:h>
diff --git a/docs/configuration/service/router-advert.rst b/docs/configuration/service/router-advert.rst
index 36fa600d..0de72941 100644
--- a/docs/configuration/service/router-advert.rst
+++ b/docs/configuration/service/router-advert.rst
@@ -61,6 +61,8 @@ Advertising a Prefix
:header: "VyOS Field", "Description"
:widths: 10,30
+ "decrement-lifetime", "Lifetime is decremented by the number of seconds since the last RA - use in conjunction with a DHCPv6-PD prefix"
+ "deprecate-prefix", "Upon shutdown, this option will deprecate the prefix by announcing it in the shutdown RA"
"no-autonomous-flag","Prefix can not be used for stateless address auto-configuration"
"no-on-link-flag","Prefix can not be used for on-link determination"
"preferred-lifetime","Time in seconds that the prefix will remain preferred (default 4 hours)"