From 0616b079404476e4d1f5f080afaf813147e24c41 Mon Sep 17 00:00:00 2001
From: phil <phil@systemausfall.org>
Date: Fri, 3 Nov 2023 22:18:02 +0100
Subject: [PATCH] Reorganize Logging

---
 tasks/logging.yml    | 25 +++++++++++++++++++++++++
 tasks/main.yml       |  6 +-----
 tasks/monitoring.yml |  8 --------
 tasks/rsyslog.yml    | 14 --------------
 4 files changed, 26 insertions(+), 27 deletions(-)
 create mode 100644 tasks/logging.yml
 delete mode 100644 tasks/monitoring.yml
 delete mode 100644 tasks/rsyslog.yml

diff --git a/tasks/logging.yml b/tasks/logging.yml
new file mode 100644
index 0000000..ca7c10d
--- /dev/null
+++ b/tasks/logging.yml
@@ -0,0 +1,25 @@
+---
+- name: "Logging | Install rsyslog"
+  ansible.builtin.apt:
+    pkg: rsyslog
+
+- name: "Logging | Disable logging of IP addresses"
+  ansible.builtin.copy:
+    src: rsyslog.d/mail.conf
+    dest: /etc/rsyslog.d/mail.conf
+    mode: "0644"
+  notify: restart rsyslog
+
+- name: "Logging | Disable mail logging to syslog"
+  ansible.builtin.replace:
+    path: /etc/rsyslog.conf
+    regexp: "^\\*\\.\\*(?!.*(mail\\.none).*$).*"
+    replace: "*.*;auth,authpriv.none,mail.none    -/var/log/syslog"
+  notify: restart rsyslog
+
+- name: "Logging | Setup cron job for pflogsum"
+  ansible.builtin.cron:
+    name: "Daily pflogsum statistics"
+    job: '/usr/sbin/pflogsumm {{ pflogsumm_options }} {{ pflogsumm_file }} | mail -s "{{ postfix_pflogsumm_mail_subject }} ({{ inventory_hostname }})" {{ postfix_pflogsumm_recipient }}'
+    hour: "{{ pflogsumm_cron_hour }}"
+    minute: "{{ pflogsumm_cron_minute }}"
diff --git a/tasks/main.yml b/tasks/main.yml
index 0740942..683e45c 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -46,11 +46,7 @@
   tags: hostname
   when: postfix_type == "internet"
 
-- name: Monitoring
-  ansible.builtin.import_tasks: monitoring.yml
-  tags: monitoring
-
 - name: Logging
-  ansible.builtin.import_tasks: rsyslog.yml
+  ansible.builtin.import_tasks: logging.yml
   tags: logging
   when: postfix_type == "internet"
diff --git a/tasks/monitoring.yml b/tasks/monitoring.yml
deleted file mode 100644
index 16f879f..0000000
--- a/tasks/monitoring.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-- name: "Monitoring | Setup cron job for pflogsum"
-  ansible.builtin.cron:
-    name: "Daily pflogsum statistics"
-    job: '/usr/sbin/pflogsumm {{ pflogsumm_options }} {{ pflogsumm_file }} | mail -s "{{ postfix_pflogsumm_mail_subject }} ({{ inventory_hostname }})" {{ postfix_pflogsumm_recipient }}'
-    hour: "{{ pflogsumm_cron_hour }}"
-    minute: "{{ pflogsumm_cron_minute }}"
-  when: postfix_pflogsumm_enabled
diff --git a/tasks/rsyslog.yml b/tasks/rsyslog.yml
deleted file mode 100644
index acf4303..0000000
--- a/tasks/rsyslog.yml
+++ /dev/null
@@ -1,14 +0,0 @@
----
-- name: "Rsyslog | Disable logging of IP addresses"
-  ansible.builtin.copy:
-    src: rsyslog.d/mail.conf
-    dest: /etc/rsyslog.d/mail.conf
-    mode: "0644"
-  notify: restart rsyslog
-
-- name: "Rsyslog | Disable mail logging to syslog"
-  ansible.builtin.replace:
-    path: /etc/rsyslog.conf
-    regexp: "^\\*\\.\\*(?!.*(mail\\.none).*$).*"
-    replace: "*.*;auth,authpriv.none,mail.none    -/var/log/syslog"
-  notify: restart rsyslog