From dff0d9922c414210829e88c543e25810a7cdb110 Mon Sep 17 00:00:00 2001 From: Jeltz Date: Tue, 30 Mar 2021 10:05:47 +0200 Subject: [PATCH 1/2] Store log.adm.auro.re local logs in /var/log/remote --- roles/docker/templates/update-motd.d/05-service.j2 | 3 --- roles/nginx/templates/update-motd.d/05-service.j2 | 3 --- roles/re2o_service/templates/update-motd.d/05-service.j2 | 3 --- roles/rsyslog_collector/templates/20-collector.conf.j2 | 3 +++ roles/unifi_controller/templates/update-motd.d/05-service.j2 | 3 --- 5 files changed, 3 insertions(+), 12 deletions(-) delete mode 100755 roles/docker/templates/update-motd.d/05-service.j2 delete mode 100755 roles/nginx/templates/update-motd.d/05-service.j2 delete mode 100755 roles/re2o_service/templates/update-motd.d/05-service.j2 delete mode 100755 roles/unifi_controller/templates/update-motd.d/05-service.j2 diff --git a/roles/docker/templates/update-motd.d/05-service.j2 b/roles/docker/templates/update-motd.d/05-service.j2 deleted file mode 100755 index ce5faaa..0000000 --- a/roles/docker/templates/update-motd.d/05-service.j2 +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh -# {{ ansible_managed }} -echo "> Les recettes Docker-compose se trouvent dans /var/local/ansible-docker" diff --git a/roles/nginx/templates/update-motd.d/05-service.j2 b/roles/nginx/templates/update-motd.d/05-service.j2 deleted file mode 100755 index c52c655..0000000 --- a/roles/nginx/templates/update-motd.d/05-service.j2 +++ /dev/null @@ -1,3 +0,0 @@ -#!/usr/bin/tail +14 -{{ ansible_managed | comment }} -> NGINX a été déployé sur cette machine. Voir /etc/nginx/. diff --git a/roles/re2o_service/templates/update-motd.d/05-service.j2 b/roles/re2o_service/templates/update-motd.d/05-service.j2 deleted file mode 100755 index 4ed8a74..0000000 --- a/roles/re2o_service/templates/update-motd.d/05-service.j2 +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh -# {{ ansible_managed }} -echo "✨ Le service re2o {{ service_name }} est dans {{ service_homedir }}/{{ service_name }}" diff --git a/roles/rsyslog_collector/templates/20-collector.conf.j2 b/roles/rsyslog_collector/templates/20-collector.conf.j2 index 897945f..e8b277f 100644 --- a/roles/rsyslog_collector/templates/20-collector.conf.j2 +++ b/roles/rsyslog_collector/templates/20-collector.conf.j2 @@ -52,3 +52,6 @@ input( ruleset="handleIncomingLogs" ) {% endfor %} + +# Store local logs too +call handleIncomingLogs diff --git a/roles/unifi_controller/templates/update-motd.d/05-service.j2 b/roles/unifi_controller/templates/update-motd.d/05-service.j2 deleted file mode 100755 index b768773..0000000 --- a/roles/unifi_controller/templates/update-motd.d/05-service.j2 +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh -# {{ ansible_managed }} -echo "> Le contrôleur Unifi a été déployé sur cette machine." From 8ab4159d383787bb6e46e02175761fab5aafb48b Mon Sep 17 00:00:00 2001 From: Jeltz Date: Tue, 30 Mar 2021 10:06:36 +0200 Subject: [PATCH 2/2] Don't try to configure rsyslog on Wi-Fi APs --- log.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/log.yml b/log.yml index fb8db3d..e63f59a 100644 --- a/log.yml +++ b/log.yml @@ -3,7 +3,7 @@ roles: - rsyslog_collector -- hosts: all +- hosts: all,!unifi roles: - rsyslog_common ...