From 19609c17ae80a484cb7ea15a6dd3e169cf8ae9b4 Mon Sep 17 00:00:00 2001 From: Yuriy Andamasov Date: Tue, 5 May 2026 03:07:10 +0300 Subject: docs: address review feedback (backport from PR #1857) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 🤖 Generated by [robots](https://vyos.io) --- .../DHCPRelay_through_GRE/md-DHCPRelay_through_GRE.md | 2 +- .../autotest/tunnelbroker/md-tunnelbroker.md | 2 +- docs/configexamples/md-azure-vpn-bgp.md | 4 ++-- docs/configexamples/md-dmvpn-dualhub-dualcloud.md | 2 +- docs/configexamples/md-fwall-and-bridge.md | 8 ++++---- docs/configexamples/md-ha.md | 2 +- docs/configexamples/md-ipsec-pa-route-based.md | 18 +++++++++--------- docs/configexamples/md-l3vpn-hub-and-spoke.md | 2 +- docs/configexamples/md-nmp.md | 2 +- .../md-policy-based-ipsec-and-firewall.md | 2 +- docs/configexamples/md-pppoe-ipv6-basic.md | 2 +- docs/configexamples/md-zone-policy.md | 1 + 12 files changed, 24 insertions(+), 23 deletions(-) (limited to 'docs/configexamples') diff --git a/docs/configexamples/autotest/DHCPRelay_through_GRE/md-DHCPRelay_through_GRE.md b/docs/configexamples/autotest/DHCPRelay_through_GRE/md-DHCPRelay_through_GRE.md index 6581cfb3..ec90f3d3 100644 --- a/docs/configexamples/autotest/DHCPRelay_through_GRE/md-DHCPRelay_through_GRE.md +++ b/docs/configexamples/autotest/DHCPRelay_through_GRE/md-DHCPRelay_through_GRE.md @@ -1,4 +1,4 @@ -# DHCP Relay trough GRE-Bridge +# DHCP Relay through GRE-Bridge Testdate: 2023-05-11 diff --git a/docs/configexamples/autotest/tunnelbroker/md-tunnelbroker.md b/docs/configexamples/autotest/tunnelbroker/md-tunnelbroker.md index 388a459d..6789fa79 100644 --- a/docs/configexamples/autotest/tunnelbroker/md-tunnelbroker.md +++ b/docs/configexamples/autotest/tunnelbroker/md-tunnelbroker.md @@ -174,7 +174,7 @@ The format of these addresses: - `2001:470:xxxx::/48`: The whole subnet. xxxx should come from Tunnelbroker. - `2001:470:xxxx:1::/64`: A subnet suitable for a LAN - `2001:470:xxxx:2::/64`: Another subnet -- `2001:470:xxxx:ffff:/64`: The last usable /64 subnet. +- `2001:470:xxxx:ffff::/64`: The last usable /64 subnet. In the above examples, 1,2,ffff are all chosen by you. You can use 1-ffff (1-65535). diff --git a/docs/configexamples/md-azure-vpn-bgp.md b/docs/configexamples/md-azure-vpn-bgp.md index 8020aca0..0228795f 100644 --- a/docs/configexamples/md-azure-vpn-bgp.md +++ b/docs/configexamples/md-azure-vpn-bgp.md @@ -98,7 +98,7 @@ set interfaces vti vti1 ip adjust-mss 1350 set vpn ipsec authentication psk azure id '198.51.100.3' set vpn ipsec authentication psk azure id '203.0.113.2' set vpn ipsec authentication psk azure secret 'ch00s3-4-s3cur3-psk' -set vpn ipsec site-to-site peer azure authentication local-id '198.51.100.3' +set vpn ipsec site-to-site peer 203.0.113.2 authentication local-id '198.51.100.3' set vpn ipsec site-to-site peer 203.0.113.2 authentication mode 'pre-shared-secret' set vpn ipsec site-to-site peer 203.0.113.2 authentication remote-id '203.0.113.2' set vpn ipsec site-to-site peer 203.0.113.2 connection-type 'initiate' @@ -106,7 +106,7 @@ set vpn ipsec site-to-site peer 203.0.113.2 description 'AZURE PRIMARY TUNNEL' set vpn ipsec site-to-site peer 203.0.113.2 ike-group 'AZURE' set vpn ipsec site-to-site peer 203.0.113.2 ikev2-reauth 'inherit' set vpn ipsec site-to-site peer 203.0.113.2 local-address '10.10.0.5' -set vpn ipsec site-to-site peer azure remote-address '203.0.113.2' +set vpn ipsec site-to-site peer 203.0.113.2 remote-address '203.0.113.2' set vpn ipsec site-to-site peer 203.0.113.2 vti bind 'vti1' set vpn ipsec site-to-site peer 203.0.113.2 vti esp-group 'AZURE' ``` diff --git a/docs/configexamples/md-dmvpn-dualhub-dualcloud.md b/docs/configexamples/md-dmvpn-dualhub-dualcloud.md index aa526366..acf5b6fb 100644 --- a/docs/configexamples/md-dmvpn-dualhub-dualcloud.md +++ b/docs/configexamples/md-dmvpn-dualhub-dualcloud.md @@ -6,7 +6,7 @@ lastproofread: '2024-02-21' # DMVPN Dual HUB Dual Cloud -This document is to describe a basic setup to build DVMPN network with two Hubs and two clouds using DMVPN Phase3. +This document is to describe a basic setup to build DMVPN network with two Hubs and two clouds using DMVPN Phase3. OSPF is used as routing protocol inside DMVPN. In this example we use VyOS 1.5 as HUBs and Spokes (HUB-1, HUB-2, SPOKE-2, SPOKE-3) and Cisco IOSv 15.5(3)M (SPOKE-1) diff --git a/docs/configexamples/md-fwall-and-bridge.md b/docs/configexamples/md-fwall-and-bridge.md index 802346ff..988eed70 100644 --- a/docs/configexamples/md-fwall-and-bridge.md +++ b/docs/configexamples/md-fwall-and-bridge.md @@ -13,7 +13,7 @@ own requirements. - Bridge br0: - Isolated layer 2 bridge. - - Accept only IPv6 communication whithin the bridge. + - Accept only IPv6 communication within the bridge. - Bridge br1: - Drop all DHCP discover packets. @@ -212,7 +212,7 @@ set firewall bridge name br1-fwd rule 20 description 'Accept ipv4 from host' set firewall bridge name br1-fwd rule 20 action 'accept' set firewall bridge name br1-fwd rule 20 source address '10.1.1.102' set firewall bridge name br1-fwd rule 20 state 'new' - # Drop everythin else within the bridge: + # Drop everything else within the bridge: set firewall bridge name br1-fwd default-action 'drop' ### br2 - br2-fwd @@ -355,7 +355,7 @@ Sep 17 14:28:19 kernel: [bri-NAM-br1-pre-10-D]IN=eth3 OUT= MAC=ff:ff:ff:ff:ff:ff And with operational mode commands, we can check rules matchers, actions, and counters. -Bridge firewall rulset: +Bridge firewall ruleset: ``` none vyos@bri:~$ show firewall bridge @@ -439,7 +439,7 @@ default drop all 0 0 vyos@bridge:~$ ``` -IPv4 firewall rulset: +IPv4 firewall ruleset: ``` none vyos@bridge:~$ show firewall ipv4 diff --git a/docs/configexamples/md-ha.md b/docs/configexamples/md-ha.md index b272f38e..c3fd4f84 100644 --- a/docs/configexamples/md-ha.md +++ b/docs/configexamples/md-ha.md @@ -489,7 +489,7 @@ You should now be able to see the advertised network on the other host. ### Duplicate configuration At this point, you now need to create the X link between all four routers. -Use amdifferent /30 for each link. +Use a different /30 for each link. ### Priorities diff --git a/docs/configexamples/md-ipsec-pa-route-based.md b/docs/configexamples/md-ipsec-pa-route-based.md index 27d97f8f..a503ce0f 100644 --- a/docs/configexamples/md-ipsec-pa-route-based.md +++ b/docs/configexamples/md-ipsec-pa-route-based.md @@ -127,15 +127,15 @@ set vpn ipsec ike-group IKE-GROUP proposal 10 dh-group '14' set vpn ipsec ike-group IKE-GROUP proposal 10 encryption 'aes128' set vpn ipsec ike-group IKE-GROUP proposal 10 hash 'sha1' set vpn ipsec options disable-route-autoinstall -set vpn ipsec site-to-site peer CISCO authentication local-id '10.0.1.2' -set vpn ipsec site-to-site peer CISCO authentication mode 'pre-shared-secret' -set vpn ipsec site-to-site peer CISCO authentication remote-id '10.0.2.2' -set vpn ipsec site-to-site peer CISCO connection-type 'initiate' -set vpn ipsec site-to-site peer CISCO default-esp-group 'ESP-GROUP' -set vpn ipsec site-to-site peer CISCO ike-group 'IKE-GROUP' -set vpn ipsec site-to-site peer CISCO local-address '10.0.1.2' -set vpn ipsec site-to-site peer CISCO remote-address '10.0.2.2' -set vpn ipsec site-to-site peer CISCO vti bind 'vti1' +set vpn ipsec site-to-site peer PA authentication local-id '10.0.1.2' +set vpn ipsec site-to-site peer PA authentication mode 'pre-shared-secret' +set vpn ipsec site-to-site peer PA authentication remote-id '10.0.2.2' +set vpn ipsec site-to-site peer PA connection-type 'initiate' +set vpn ipsec site-to-site peer PA default-esp-group 'ESP-GROUP' +set vpn ipsec site-to-site peer PA ike-group 'IKE-GROUP' +set vpn ipsec site-to-site peer PA local-address '10.0.1.2' +set vpn ipsec site-to-site peer PA remote-address '10.0.2.2' +set vpn ipsec site-to-site peer PA vti bind 'vti1' ``` ### Palo Alto diff --git a/docs/configexamples/md-l3vpn-hub-and-spoke.md b/docs/configexamples/md-l3vpn-hub-and-spoke.md index 97ce2e2a..e867c3bd 100644 --- a/docs/configexamples/md-l3vpn-hub-and-spoke.md +++ b/docs/configexamples/md-l3vpn-hub-and-spoke.md @@ -122,7 +122,7 @@ set protocols mpls ldp interface 'eth5' set protocols mpls ldp router-id '10.0.0.3' set protocols ospf area 0 network '0.0.0.0/0' set protocols ospf parameters abr-type 'cisco' -set protocols ospf parameters router-id '10.0.0.3 +set protocols ospf parameters router-id '10.0.0.3' ``` - VyOS-P2: diff --git a/docs/configexamples/md-nmp.md b/docs/configexamples/md-nmp.md index b30476ae..bb45aed9 100644 --- a/docs/configexamples/md-nmp.md +++ b/docs/configexamples/md-nmp.md @@ -25,7 +25,7 @@ set service snmp community router network '0.0.0.0/0' ## Configuration 'NMP' -Next, you just should follow the pictures: +Next, you should just follow the pictures: Network Topology Diagram diff --git a/docs/configexamples/md-policy-based-ipsec-and-firewall.md b/docs/configexamples/md-policy-based-ipsec-and-firewall.md index 13b990f6..d621f565 100644 --- a/docs/configexamples/md-policy-based-ipsec-and-firewall.md +++ b/docs/configexamples/md-policy-based-ipsec-and-firewall.md @@ -166,7 +166,7 @@ set firewall ipv4 input filter rule 20 destination port '22' set firewall ipv4 input filter rule 20 protocol 'tcp' set firewall ipv4 input filter rule 20 source group network-group 'TRUSTED' -# Input traffic: accepd dns requests only from local networks. +# Input traffic: accept dns requests only from local networks. set firewall ipv4 input filter rule 25 action 'accept' set firewall ipv4 input filter rule 25 destination port '53' set firewall ipv4 input filter rule 25 protocol 'udp' diff --git a/docs/configexamples/md-pppoe-ipv6-basic.md b/docs/configexamples/md-pppoe-ipv6-basic.md index 1314fcf1..4911bfdd 100644 --- a/docs/configexamples/md-pppoe-ipv6-basic.md +++ b/docs/configexamples/md-pppoe-ipv6-basic.md @@ -28,7 +28,7 @@ please contact your ISP for more information. ```none set interfaces pppoe pppoe0 authentication password -set interfaces pppoe pppoe0 authentication user +set interfaces pppoe pppoe0 authentication username set interfaces pppoe pppoe0 service-name set interfaces pppoe pppoe0 source-interface 'eth0' ``` diff --git a/docs/configexamples/md-zone-policy.md b/docs/configexamples/md-zone-policy.md index be80ee55..a82083bd 100644 --- a/docs/configexamples/md-zone-policy.md +++ b/docs/configexamples/md-zone-policy.md @@ -284,6 +284,7 @@ ipv6-name dmz-wan-6 { log enable state { invalid enable + } } rule 100 { action accept -- cgit v1.2.3