From 2548a95678654f15f2a97ad836270174b0ac9243 Mon Sep 17 00:00:00 2001
From: Timo Makinen <tmakinen@foo.sh>
Date: Sat, 22 Apr 2023 16:13:06 +0000
Subject: [PATCH] rsyslog: Convert remote config to new format

---
 roles/rsyslog/templates/remote.conf.j2 | 28 +++++++++++++++++---------
 1 file changed, 18 insertions(+), 10 deletions(-)

diff --git a/roles/rsyslog/templates/remote.conf.j2 b/roles/rsyslog/templates/remote.conf.j2
index 997302c..f93141b 100644
--- a/roles/rsyslog/templates/remote.conf.j2
+++ b/roles/rsyslog/templates/remote.conf.j2
@@ -1,11 +1,19 @@
-# make gtls driver the default
-$DefaultNetstreamDriver gtls
+# Certificates
+global(DefaultNetstreamDriverCAFile="{{ tls_bundle }}"
+       DefaultNetstreamDriverCertFile="{{ tls_certs }}/{{ inventory_hostname }}.crt"
+       DefaultNetstreamDriverKeyFile="{{ tls_private }}/{{ inventory_hostname }}.key")
 
-# certificate files
-$DefaultNetstreamDriverCAFile {{ tls_bundle }}
-$DefaultNetstreamDriverCertFile {{ tls_certs }}/{{ inventory_hostname }}.crt
-$DefaultNetstreamDriverKeyFile {{ tls_private }}/{{ inventory_hostname }}.key
-
-$ActionSendStreamDriverMode 1
-
-*.* @@{{ log_server }}:6514
+# Forward to remote TLS TCP server
+action(type="omfwd"
+       Target="{{ log_server }}"
+       Protocol="tcp"
+       Port="6514"
+       StreamDriver="gtls"
+       StreamDriverMode="1"
+       StreamDriverAuthMode="x509/name"
+       StreamDriverPermittedPeers="{{ log_server }}"
+       queue.filename="{{ (log_server) }}.queue"
+       queue.maxDiskSpace="1G"
+       queue.saveOnShutdown="on"
+       queue.type="LinkedList"
+       Action.ResumeRetryCount="-1")