From dd9c1a052fb7e3877b6aa34f40be0b9980db2023 Mon Sep 17 00:00:00 2001 From: Nataliia Solomko Date: Fri, 5 Apr 2024 14:33:25 +0300 Subject: conntrack-sync: T1244: Support for StartupResync in conntrackd (cherry picked from commit f4e6d33a06e6125419900723ae7dc02fe264059d) # Conflicts: # docs/configuration/service/conntrack-sync.rst --- docs/configuration/service/conntrack-sync.rst | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/docs/configuration/service/conntrack-sync.rst b/docs/configuration/service/conntrack-sync.rst index 468b39d9..5ef80396 100644 --- a/docs/configuration/service/conntrack-sync.rst +++ b/docs/configuration/service/conntrack-sync.rst @@ -98,6 +98,18 @@ Configuration This diable the external cache and directly injects the flow-states into the in-kernel Connection Tracking System of the backup firewall. +<<<<<<< HEAD +======= +.. cfgcmd:: set service conntrack-sync disable-syslog + + Disable connection logging via Syslog. + +.. cfgcmd:: set service conntrack-sync enable-startup-resync + + Order conntrackd to request a complete conntrack table resync against + the other node at startup. + +>>>>>>> f4e6d33a (conntrack-sync: T1244: Support for StartupResync in conntrackd) ********* Operation ********* -- cgit v1.2.3 From d2a3af453ebacc395c4087aacddad1820fe0d513 Mon Sep 17 00:00:00 2001 From: Nataliia Solomko Date: Fri, 5 Apr 2024 22:15:20 +0300 Subject: conntrack-sync: T1244: Support for StartupResync in conntrackd (cherry picked from commit 2b32a2e134ec4dcb1a574fd405147aeb9644abdb) --- docs/configuration/service/conntrack-sync.rst | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/docs/configuration/service/conntrack-sync.rst b/docs/configuration/service/conntrack-sync.rst index 5ef80396..db23c92f 100644 --- a/docs/configuration/service/conntrack-sync.rst +++ b/docs/configuration/service/conntrack-sync.rst @@ -98,18 +98,15 @@ Configuration This diable the external cache and directly injects the flow-states into the in-kernel Connection Tracking System of the backup firewall. -<<<<<<< HEAD -======= .. cfgcmd:: set service conntrack-sync disable-syslog Disable connection logging via Syslog. -.. cfgcmd:: set service conntrack-sync enable-startup-resync +.. cfgcmd:: set service conntrack-sync startup-resync Order conntrackd to request a complete conntrack table resync against the other node at startup. ->>>>>>> f4e6d33a (conntrack-sync: T1244: Support for StartupResync in conntrackd) ********* Operation ********* -- cgit v1.2.3