From 5a7a9f3a20e19a52572ce1b9b214528b6ce958ce Mon Sep 17 00:00:00 2001
From: Christian Breunig <christian@breunig.cc>
Date: Sat, 18 Jan 2025 20:28:16 +0100
Subject: syslog: T6989: add possibility to define VRF per remote

Rsyslog supports individual VRFs per omfwd remote entry - so we should support
this, too.
---
 data/templates/rsyslog/rsyslog.conf.j2 | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'data')

diff --git a/data/templates/rsyslog/rsyslog.conf.j2 b/data/templates/rsyslog/rsyslog.conf.j2
index daaafa6d1..45742b073 100644
--- a/data/templates/rsyslog/rsyslog.conf.j2
+++ b/data/templates/rsyslog/rsyslog.conf.j2
@@ -106,12 +106,11 @@ if prifilt("{{ tmp | join(',') }}") then {
         template="SyslogProtocol23Format"
 {%             endif %}
         TCP_Framing="{{ 'octed-counted' if remote_options.format.octet_counted is vyos_defined else 'traditional' }}"
-{%             if source_address is vyos_defined %}
-        # Sender IP address
-        Address="{{ source_address }}"
+{%             if remote_options.source_address is vyos_defined %}
+        Address="{{ remote_options.source_address }}"
 {%             endif %}
-{%             if vrf is vyos_defined %}
-        Device="{{ vrf }}"
+{%             if remote_options.vrf is vyos_defined %}
+        Device="{{ remote_options.vrf }}"
 {%             endif %}
     )
 }
@@ -121,3 +120,4 @@ if prifilt("{{ tmp | join(',') }}") then {
 
 # Include all configuration files in /etc/rsyslog.d/
 include(file="/etc/rsyslog.d/*.conf")
+
-- 
cgit v1.2.3