From d9bf0b09177c9a8e754b9de2e6094ac36f69b3fb Mon Sep 17 00:00:00 2001 From: Nicolas Fort Date: Fri, 14 Jun 2024 11:14:53 -0300 Subject: Configuration Blueprints: add new example for firewall+vrf. Also, add note about usage of inbound and outbound interface when interface is attached to a non-default vrf. (cherry picked from commit fe416b56cfa30494172a0310c16fd2787330c7bb) # Conflicts: # docs/configexamples/zone-policy.rst --- docs/configexamples/zone-policy.rst | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'docs/configexamples/zone-policy.rst') diff --git a/docs/configexamples/zone-policy.rst b/docs/configexamples/zone-policy.rst index 1af8454a..764c709b 100644 --- a/docs/configexamples/zone-policy.rst +++ b/docs/configexamples/zone-policy.rst @@ -1,10 +1,11 @@ -:lastproofread: 2021-06-29 +:lastproofread: 2024-06-14 .. _examples-zone-policy: Zone-Policy example ------------------- +<<<<<<< HEAD .. note:: Starting from VyOS 1.4-rolling-202308040557, a new firewall structure can be found on all vyos instalations, and zone based firewall is no longer supported. Documentation for most of the new firewall CLI can be @@ -15,6 +16,8 @@ Zone-Policy example chapter. The examples in this section use the legacy firewall configuration commands, since this feature has been removed in earlier releases. +======= +>>>>>>> fe416b56 (Configuration Blueprints: add new example for firewall+vrf. Also, add note about usage of inbound and outbound interface when interface is attached to a non-default vrf.) .. note:: In :vytask:`T2199` the syntax of the zone configuration was changed. The zone configuration moved from ``zone-policy zone `` to ``firewall zone ``. @@ -428,4 +431,3 @@ Something like: address ip.of.tunnel.broker } } - -- cgit v1.2.3