From 74871c1ea8b68c56f580b21f4d50ab9c0594d6cd Mon Sep 17 00:00:00 2001
From: Alexandre Iooss <erdnaxe@crans.org>
Date: Sun, 28 Nov 2021 17:09:16 +0100
Subject: [PATCH] rsyslog: move variables in playbook

---
 group_vars/all/vars.yml       |  5 -----
 host_vars/log.adm.auro.re.yml | 10 ----------
 playbooks/rsyslog.yml         | 18 +++++++++++++++++-
 3 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/group_vars/all/vars.yml b/group_vars/all/vars.yml
index 2f5c748..c55389d 100644
--- a/group_vars/all/vars.yml
+++ b/group_vars/all/vars.yml
@@ -102,9 +102,4 @@ borg_backup_exclude:
 borg_encryption_passphrase: "{{ vault_borg_encryption_passphrase }}"
 
 borg_server_host: 10.128.0.4
-
-rsyslog_outputs:
-  - proto: relp
-    address: 10.128.0.241
-    port: 20514
 ...
diff --git a/host_vars/log.adm.auro.re.yml b/host_vars/log.adm.auro.re.yml
index f088784..675fe4e 100644
--- a/host_vars/log.adm.auro.re.yml
+++ b/host_vars/log.adm.auro.re.yml
@@ -3,14 +3,4 @@ borg_backup_directories:
   - "/etc/"
   - "/var/"
 borg_backup_exclude: []
-
-rsyslog_collector_base_dir: /var/log/remote
-rsyslog_inputs:
-  - proto: relp
-    port: 20514
-  - proto: udp
-    port: 514
-  - proto: tcp
-    port: 6514
-rsyslog_outputs: []
 ...
diff --git a/playbooks/rsyslog.yml b/playbooks/rsyslog.yml
index b37e4d5..0bb170f 100755
--- a/playbooks/rsyslog.yml
+++ b/playbooks/rsyslog.yml
@@ -1,10 +1,26 @@
 #!/usr/bin/env ansible-playbook
 ---
 - hosts: log.adm.auro.re
+  vars:
+    rsyslog_collector_base_dir: /var/log/remote
+    rsyslog_inputs:
+      - proto: relp
+        port: 20514
+      - proto: udp
+        port: 514
+      - proto: tcp
+        port: 6514
+    rsyslog_outputs: []
   roles:
+    - rsyslog_common
     - rsyslog_collector
 
-- hosts: all,!unifi
+- hosts: all,!log.adm.auro.re,!unifi
+  vars:
+    rsyslog_outputs:
+      - proto: relp
+        address: 10.128.0.241
+        port: 20514
   roles:
     - rsyslog_common
 ...