From a7ac0fd5ceb993a8fbb256a3fd91d0d6c6531887 Mon Sep 17 00:00:00 2001
From: Gaige B Paulsen <gaige@cluetrust.net>
Date: Sat, 9 Nov 2024 21:43:44 -0500
Subject: T6815:Fix compatibility with 1.3-1.5 of VyOS (Step 1) (#352)

* omnibus update for 1.3-1.4 (with some support for 1.5)

(see contents in release fragments)
---------

Co-authored-by: Om Nom <omnom62@outlook.com>
---
 docs/vyos.vyos.vyos_firewall_global_module.rst | 2 ++
 docs/vyos.vyos.vyos_firewall_rules_module.rst  | 6 ++++++
 2 files changed, 8 insertions(+)

(limited to 'docs')

diff --git a/docs/vyos.vyos.vyos_firewall_global_module.rst b/docs/vyos.vyos.vyos_firewall_global_module.rst
index 34293b1..a77ce80 100644
--- a/docs/vyos.vyos.vyos_firewall_global_module.rst
+++ b/docs/vyos.vyos.vyos_firewall_global_module.rst
@@ -852,6 +852,7 @@ Examples
             - connection_type: established
               action: accept
               log: true
+              log_level: emer
             - connection_type: invalid
               action: reject
           route_redirects:
@@ -897,6 +898,7 @@ Examples
     #        "set firewall config-trap 'enable'",
     #        "set firewall state-policy established action 'accept'",
     #        "set firewall state-policy established log 'enable'",
+    #        "set firewall state-policy established log-level 'emer'",
     #        "set firewall state-policy invalid action 'reject'",
     #        "set firewall broadcast-ping 'enable'",
     #        "set firewall all-ping 'enable'",
diff --git a/docs/vyos.vyos.vyos_firewall_rules_module.rst b/docs/vyos.vyos.vyos_firewall_rules_module.rst
index 246824b..b3d619b 100644
--- a/docs/vyos.vyos.vyos_firewall_rules_module.rst
+++ b/docs/vyos.vyos.vyos_firewall_rules_module.rst
@@ -546,8 +546,14 @@ Parameters
                 </td>
                 <td>
                         <ul style="margin: 0; padding: 0"><b>Choices:</b>
+                                <br><i>VyOS 1.4 & older:</i><br>
                                     <li>match-ipsec</li>
                                     <li>match-none</li>
+                                <br><i>VyOS 1.5+ :</i><br>
+                                    <li>match-ipsec-in</li>
+                                    <li>match-ipsec-out</li>
+                                    <li>match-none-in</li>
+                                    <li>match-none-out</li>
                         </ul>
                 </td>
                 <td>
-- 
cgit v1.2.3