From 827b20a57b16189a2e8ca074815c44da259695b3 Mon Sep 17 00:00:00 2001
From: Sheppy <sheppy@atlantishq.de>
Date: Tue, 3 Jan 2023 20:31:49 +0100
Subject: [PATCH] fix: various rsyslog deploy problems

---
 roles/rsyslog/tasks/main.yaml           | 8 +++++++-
 roles/rsyslog/templates/rsyslog.conf.j2 | 2 +-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/roles/rsyslog/tasks/main.yaml b/roles/rsyslog/tasks/main.yaml
index 5b2aaeb..c1aba79 100644
--- a/roles/rsyslog/tasks/main.yaml
+++ b/roles/rsyslog/tasks/main.yaml
@@ -2,7 +2,6 @@
   apt:
     pkg:
      - rsyslog
-     - rsyslog-pgsql
     state: present
 
 - name: Install rsyslog psql on master
@@ -12,6 +11,13 @@
     state: present
   when: monitoring_master
 
+- name: Ensure no rsyslog psql on non-master
+  apt:
+    pkg:
+     - rsyslog-pgsql
+    state: absent
+  when: not monitoring_master
+
 - name: Rsyslog Main config
   template:
     src: rsyslog.conf.j2 
diff --git a/roles/rsyslog/templates/rsyslog.conf.j2 b/roles/rsyslog/templates/rsyslog.conf.j2
index 09fe0e0..1a23c3f 100644
--- a/roles/rsyslog/templates/rsyslog.conf.j2
+++ b/roles/rsyslog/templates/rsyslog.conf.j2
@@ -87,7 +87,7 @@ mail.err			/var/log/mail.err
 	cron,daemon.none;\
 	mail.none		-/var/log/messages
 
-{% if not monitoring_master %}
+{% if monitoring_master %}
 $CreateDirs on
 $template RemoteLogs,"/var/log/rsyslog/%HOSTNAME%/%PROGRAMNAME%.log"
 *.* ?RemoteLogs