summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--docs/configuration/service/conntrack-sync.rst12
1 files changed, 12 insertions, 0 deletions
diff --git a/docs/configuration/service/conntrack-sync.rst b/docs/configuration/service/conntrack-sync.rst
index c95cadc9..ccaaefff 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
*********