summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniil Baturin <daniil@vyos.io>2024-03-07 11:27:11 +0100
committerGitHub <noreply@github.com>2024-03-07 11:27:11 +0100
commit423a25a814ca92870399dab1c5e107732a16292d (patch)
treee831676b1417e57412cbc2fe0a5be38b6d76e738
parent0a464cbf20af647b84b787aca43d03b3f78de77c (diff)
parent39585a520f03048486b9e498f5b1439b17569550 (diff)
downloadvyos-1x-423a25a814ca92870399dab1c5e107732a16292d.tar.gz
vyos-1x-423a25a814ca92870399dab1c5e107732a16292d.zip
Merge pull request #3104 from natali-rs1985/T6057-equuleus
conntrack-sync: T6057: Add ability to disable syslog for conntrackd
-rw-r--r--data/templates/conntrackd/conntrackd.conf.tmpl2
-rw-r--r--interface-definitions/service_conntrack-sync.xml.in6
2 files changed, 7 insertions, 1 deletions
diff --git a/data/templates/conntrackd/conntrackd.conf.tmpl b/data/templates/conntrackd/conntrackd.conf.tmpl
index 7ec8a727c..3f957b696 100644
--- a/data/templates/conntrackd/conntrackd.conf.tmpl
+++ b/data/templates/conntrackd/conntrackd.conf.tmpl
@@ -73,7 +73,7 @@ General {
HashSize {{ hash_size }}
HashLimit {{ table_size | int *2 }}
LogFile off
- Syslog on
+ Syslog {{ 'off' if disable_syslog is defined else 'on' }}
LockFile /var/lock/conntrack.lock
UNIX {
Path /var/run/conntrackd.ctl
diff --git a/interface-definitions/service_conntrack-sync.xml.in b/interface-definitions/service_conntrack-sync.xml.in
index 584f687c7..105c2a3a0 100644
--- a/interface-definitions/service_conntrack-sync.xml.in
+++ b/interface-definitions/service_conntrack-sync.xml.in
@@ -51,6 +51,12 @@
<valueless/>
</properties>
</leafNode>
+ <leafNode name="disable-syslog">
+ <properties>
+ <help>Disable connection logging via Syslog</help>
+ <valueless/>
+ </properties>
+ </leafNode>
<leafNode name="event-listen-queue-size">
<properties>
<help>Queue size for local conntrack events</help>