diff options
| -rw-r--r-- | docs/appendix/examples/bgp-ipv6-unnumbered.rst | 76 | ||||
| -rw-r--r-- | docs/appendix/examples/ha.rst | 4 | ||||
| -rw-r--r-- | docs/appendix/examples/zone-policy.rst | 2 | ||||
| -rw-r--r-- | docs/commandscripting.rst | 4 | ||||
| -rw-r--r-- | docs/configuration-overview.rst | 12 | ||||
| -rw-r--r-- | docs/quick-start.rst | 4 | ||||
| -rw-r--r-- | docs/troubleshooting.rst | 6 | 
7 files changed, 54 insertions, 54 deletions
| diff --git a/docs/appendix/examples/bgp-ipv6-unnumbered.rst b/docs/appendix/examples/bgp-ipv6-unnumbered.rst index 0e5f48b4..77aa2215 100644 --- a/docs/appendix/examples/bgp-ipv6-unnumbered.rst +++ b/docs/appendix/examples/bgp-ipv6-unnumbered.rst @@ -12,39 +12,39 @@ Configuration  .. code-block:: none -  set protocols bgp 65020 address-family ipv4-unicast redistribute connected -  set protocols bgp 65020 address-family ipv6-unicast redistribute connected -  set protocols bgp 65020 neighbor eth1 interface v6only -  set protocols bgp 65020 neighbor eth1 interface v6only peer-group 'fabric' -  set protocols bgp 65020 neighbor eth2 interface v6only -  set protocols bgp 65020 neighbor eth2 interface v6only peer-group 'fabric' -  set protocols bgp 65020 parameters bestpath as-path multipath-relax -  set protocols bgp 65020 parameters bestpath compare-routerid -  set protocols bgp 65020 parameters default no-ipv4-unicast -  set protocols bgp 65020 parameters router-id '192.168.0.1' -  set protocols bgp 65020 peer-group fabric address-family ipv4-unicast -  set protocols bgp 65020 peer-group fabric address-family ipv6-unicast -  set protocols bgp 65020 peer-group fabric capability extended-nexthop -  set protocols bgp 65020 peer-group fabric remote-as 'external' +  set protocols bgp 64496 address-family ipv4-unicast redistribute connected +  set protocols bgp 64496 address-family ipv6-unicast redistribute connected +  set protocols bgp 64496 neighbor eth1 interface v6only +  set protocols bgp 64496 neighbor eth1 interface v6only peer-group 'fabric' +  set protocols bgp 64496 neighbor eth2 interface v6only +  set protocols bgp 64496 neighbor eth2 interface v6only peer-group 'fabric' +  set protocols bgp 64496 parameters bestpath as-path multipath-relax +  set protocols bgp 64496 parameters bestpath compare-routerid +  set protocols bgp 64496 parameters default no-ipv4-unicast +  set protocols bgp 64496 parameters router-id '192.168.0.1' +  set protocols bgp 64496 peer-group fabric address-family ipv4-unicast +  set protocols bgp 64496 peer-group fabric address-family ipv6-unicast +  set protocols bgp 64496 peer-group fabric capability extended-nexthop +  set protocols bgp 64496 peer-group fabric remote-as 'external'  - Router B:  .. code-block:: none -  set protocols bgp 65021 address-family ipv4-unicast redistribute connected -  set protocols bgp 65021 address-family ipv6-unicast redistribute connected -  set protocols bgp 65021 neighbor eth1 interface v6only -  set protocols bgp 65021 neighbor eth1 interface v6only peer-group 'fabric' -  set protocols bgp 65021 neighbor eth2 interface v6only -  set protocols bgp 65021 neighbor eth2 interface v6only peer-group 'fabric' -  set protocols bgp 65021 parameters bestpath as-path multipath-relax -  set protocols bgp 65021 parameters bestpath compare-routerid -  set protocols bgp 65021 parameters default no-ipv4-unicast -  set protocols bgp 65021 parameters router-id '192.168.0.2' -  set protocols bgp 65021 peer-group fabric address-family ipv4-unicast -  set protocols bgp 65021 peer-group fabric address-family ipv6-unicast -  set protocols bgp 65021 peer-group fabric capability extended-nexthop -  set protocols bgp 65021 peer-group fabric remote-as 'external' +  set protocols bgp 64499 address-family ipv4-unicast redistribute connected +  set protocols bgp 64499 address-family ipv6-unicast redistribute connected +  set protocols bgp 64499 neighbor eth1 interface v6only +  set protocols bgp 64499 neighbor eth1 interface v6only peer-group 'fabric' +  set protocols bgp 64499 neighbor eth2 interface v6only +  set protocols bgp 64499 neighbor eth2 interface v6only peer-group 'fabric' +  set protocols bgp 64499 parameters bestpath as-path multipath-relax +  set protocols bgp 64499 parameters bestpath compare-routerid +  set protocols bgp 64499 parameters default no-ipv4-unicast +  set protocols bgp 64499 parameters router-id '192.168.0.2' +  set protocols bgp 64499 peer-group fabric address-family ipv4-unicast +  set protocols bgp 64499 peer-group fabric address-family ipv6-unicast +  set protocols bgp 64499 peer-group fabric capability extended-nexthop +  set protocols bgp 64499 peer-group fabric remote-as 'external'  Results  ^^^^^^^^^^^^^ @@ -57,7 +57,7 @@ Results    Codes: S - State, L - Link, u - Up, D - Down, A - Admin Down    Interface        IP Address                        S/L  Description    ---------        ----------                        ---  ----------- -  eth0             62.104.XXX.XXX/24                 u/u +  eth0             198.51.100.34/24                  u/u    eth1             -                                 u/u    eth2             -                                 u/u    lo               127.0.0.1/8                       u/u @@ -73,8 +73,8 @@ Results           F - PBR, f - OpenFabric,           > - selected route, * - FIB route -  S>* 0.0.0.0/0 [210/0] via 62.104.XXX.XXX, eth0, 03:21:53 -  C>* 62.104.56.0/24 is directly connected, eth0, 03:21:53 +  S>* 0.0.0.0/0 [210/0] via 198.51.100.34, eth0, 03:21:53 +  C>* 198.51.100.0/24 is directly connected, eth0, 03:21:53    C>* 192.168.0.1/32 is directly connected, lo, 03:21:56    B>* 192.168.0.2/32 [20/0] via fe80::a00:27ff:fe3b:7ed2, eth2, 00:05:07      *                       via fe80::a00:27ff:fe7b:4000, eth1, 00:05:07 @@ -105,8 +105,8 @@ Results    Peer groups 1, using 64 bytes of memory    Neighbor        V         AS MsgRcvd MsgSent   TblVer  InQ OutQ  Up/Down State/PfxRcd -  eth1            4      65021      13      13        0    0    0 00:05:33            2 -  eth2            4      65021      13      14        0    0    0 00:05:29            2 +  eth1            4      64499      13      13        0    0    0 00:05:33            2 +  eth2            4      64499      13      14        0    0    0 00:05:29            2    Total number of neighbors 2 @@ -118,7 +118,7 @@ Results    Codes: S - State, L - Link, u - Up, D - Down, A - Admin Down    Interface        IP Address                        S/L  Description    ---------        ----------                        ---  ----------- -  eth0             62.104.XXX.XXX/24                 u/u +  eth0             198.51.100.33/24                  u/u    eth1             -                                 u/u    eth2             -                                 u/u    lo               127.0.0.1/8                       u/u @@ -134,8 +134,8 @@ Results           F - PBR, f - OpenFabric,           > - selected route, * - FIB route -  S>* 0.0.0.0/0 [210/0] via 62.104.XXX.XXX, eth0, 00:44:08 -  C>* 62.104.56.0/24 is directly connected, eth0, 00:44:09 +  S>* 0.0.0.0/0 [210/0] via 198.51.100.33, eth0, 00:44:08 +  C>* 198.51.100.0/24 is directly connected, eth0, 00:44:09    B>* 192.168.0.1/32 [20/0] via fe80::a00:27ff:fe2d:205d, eth1, 00:06:18      *                       via fe80::a00:27ff:fe93:e142, eth2, 00:06:18    C>* 192.168.0.2/32 is directly connected, lo, 00:44:11 @@ -164,8 +164,8 @@ Results    Peer groups 1, using 64 bytes of memory    Neighbor        V         AS MsgRcvd MsgSent   TblVer  InQ OutQ  Up/Down State/PfxRcd -  eth1            4      65020      14      14        0    0    0 00:06:40            2 -  eth2            4      65020      14      14        0    0    0 00:06:37            2 +  eth1            4      64496      14      14        0    0    0 00:06:40            2 +  eth2            4      64496      14      14        0    0    0 00:06:37            2    Total number of neighbors 2 diff --git a/docs/appendix/examples/ha.rst b/docs/appendix/examples/ha.rst index 6dbc0334..5cf5126f 100644 --- a/docs/appendix/examples/ha.rst +++ b/docs/appendix/examples/ha.rst @@ -313,7 +313,7 @@ We use small /30's from 10.254.60/24 for the point-to-point links.  router1  ~~~~~~~ -Replace the 99.99.99.99 with whatever the other router's IP address is. +Replace the 203.0.113.3 with whatever the other router's IP address is.  .. code-block:: none @@ -328,7 +328,7 @@ Replace the 99.99.99.99 with whatever the other router's IP address is.     set interfaces wireguard wg01 ip ospf retransmit-interval '5'     set interfaces wireguard wg01 ip ospf transmit-delay '1'     set interfaces wireguard wg01 peer OFFSITE1 allowed-ips '0.0.0.0/0' -   set interfaces wireguard wg01 peer OFFSITE1 endpoint '99.99.99.99:50001' +   set interfaces wireguard wg01 peer OFFSITE1 endpoint '203.0.113.3:50001'     set interfaces wireguard wg01 peer OFFSITE1 persistent-keepalive '15'     set interfaces wireguard wg01 peer OFFSITE1 pubkey 'GEFMOWzAyau42/HwdwfXnrfHdIISQF8YHj35rOgSZ0o='     set interfaces wireguard wg01 port '50001' diff --git a/docs/appendix/examples/zone-policy.rst b/docs/appendix/examples/zone-policy.rst index 7a25d063..db985258 100644 --- a/docs/appendix/examples/zone-policy.rst +++ b/docs/appendix/examples/zone-policy.rst @@ -30,7 +30,7 @@ It will look something like this:    interfaces {        ethernet eth0 {            duplex auto -          hw-id 00:0c:29:6e:2a:92 +          hw-id 00:53:ed:6e:2a:92            smp_affinity auto            speed auto            vif 10 { diff --git a/docs/commandscripting.rst b/docs/commandscripting.rst index 5d14c6c5..3c437fb0 100644 --- a/docs/commandscripting.rst +++ b/docs/commandscripting.rst @@ -55,8 +55,8 @@ Here is a simple example:    #!/usr/bin/env python    print "delete firewall group address-group somehosts" -  print "set firewall group address-group somehosts address '1.1.1.1'" -  print "set firewall group address-group somehosts address '1.1.1.2'" +  print "set firewall group address-group somehosts address '192.0.2.3'" +  print "set firewall group address-group somehosts address '203.0.113.55'"  .. code-block:: none diff --git a/docs/configuration-overview.rst b/docs/configuration-overview.rst index c4fc36e0..2c7a086e 100644 --- a/docs/configuration-overview.rst +++ b/docs/configuration-overview.rst @@ -17,7 +17,7 @@ using the show configuration command.    interfaces {        ethernet eth0 {            address dhcp -          hw-id 00:0c:29:44:3b:0f +          hw-id 00:53:dd:44:3b:0f        }        loopback lo {        } @@ -78,7 +78,7 @@ running configuration.    vyos@vyos:~$ show configuration commands    set interfaces ethernet eth0 address 'dhcp' -  set interfaces ethernet eth0 hw-id '00:0c:29:44:3b:0f' +  set interfaces ethernet eth0 hw-id '00:53:dd:44:3b:0f'    set interfaces loopback 'lo'    set service ssh port '22'    set system config-management commit-revisions '20' @@ -170,7 +170,7 @@ replacements and ``-`` for deletions.    ethernet eth0 {        description MY_OLD_DESCRIPTION        disable -      hw-id 52:54:00:0e:82:d9 +      hw-id 00:53:dd:44:3b:03    }    loopback lo {    } @@ -186,7 +186,7 @@ replacements and ``-`` for deletions.   +    address dhcp   >    description MY_NEW_DESCRIPTION   -    disable -      hw-id 52:54:00:0e:82:d9 +      hw-id 00:53:dd:44:3b:03    }    loopback lo {    } @@ -198,7 +198,7 @@ using ``show | commands``    vyos@vyos# show interfaces ethernet eth0 | commands    set address dhcp -  set hw-id 00:0c:29:44:3b:0f +  set hw-id 00:53:ad:44:3b:03  These commands are also relative to the level you are inside and only relevant  configuration blocks will be displayed when entering a sub-level. @@ -208,7 +208,7 @@ configuration blocks will be displayed when entering a sub-level.    [edit interfaces ethernet eth0]    vyos@vyos# show     address dhcp -   hw-id 00:0c:29:44:3b:0f +   hw-id 00:53:ad:44:3b:03  Exiting from the configuration mode is done via the ``exit`` command from the  top level, executing `exit` from within a sub-level takes you back to the top diff --git a/docs/quick-start.rst b/docs/quick-start.rst index bb651c29..9eee49a6 100644 --- a/docs/quick-start.rst +++ b/docs/quick-start.rst @@ -47,8 +47,8 @@ And a DNS forwarder:    set service dns forwarding cache-size '0'    set service dns forwarding listen-address '192.168.0.1' -  set service dns forwarding name-server '8.8.8.8' -  set service dns forwarding name-server '8.8.4.4' +  set service dns forwarding name-server '203.0.113.1' +  set service dns forwarding name-server '203.0.113.2'  NAT and Firewall  ^^^^^^^^^^^^^^^^ diff --git a/docs/troubleshooting.rst b/docs/troubleshooting.rst index 477d1a4c..148bce4c 100644 --- a/docs/troubleshooting.rst +++ b/docs/troubleshooting.rst @@ -27,7 +27,7 @@ Several options are available when more extensive troubleshooting is needed:  .. code-block:: none -  vyos@vyos:~$ ping 8.8.8.8 +  vyos@vyos:~$ ping 10.1.1.1    Possible completions:      <Enter>       Execute the current command      adaptive      Ping options @@ -247,8 +247,8 @@ Will clear the screen and show you the output of ``show interfaces`` every    eth0.5           198.51.100.4/24                   u/u  WAN    lo               127.0.0.1/8                       u/u                     ::1/128 -  vti0             172.32.254.2/30                   u/u -  vti1             172.32.254.9/30                   u/u +  vti0             172.25.254.2/30                   u/u +  vti1             172.25.254.9/30                   u/u  Clear Command  ------------- | 
