From f9da5259947c5de4a46c5133f6703d5f5f9e16a6 Mon Sep 17 00:00:00 2001
From: Michal Konecny <mkonecny@redhat.com>
Date: Tue, 12 Nov 2024 13:33:55 +0100
Subject: [PATCH] [mailman] Remove the logrotate config

The config is now provided by the mailman3 package and it's the same
provided by the ansible role.

And we have two of them in the role, probably a oversight.

Signed-off-by: Michal Konecny <mkonecny@redhat.com>
---
 roles/mailman3/files/mailman3.logrotate.conf  |  6 -----
 roles/mailman3/tasks/main.yml                 | 22 -------------------
 roles/mailman3/templates/mailman.logrotate.j2 | 13 -----------
 3 files changed, 41 deletions(-)
 delete mode 100644 roles/mailman3/files/mailman3.logrotate.conf
 delete mode 100644 roles/mailman3/templates/mailman.logrotate.j2

diff --git a/roles/mailman3/files/mailman3.logrotate.conf b/roles/mailman3/files/mailman3.logrotate.conf
deleted file mode 100644
index cc5bb7438f..0000000000
--- a/roles/mailman3/files/mailman3.logrotate.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-/var/log/mailman3/*.log {
-    missingok
-    notifempty
-    delaycompress
-    su root apache
-}
diff --git a/roles/mailman3/tasks/main.yml b/roles/mailman3/tasks/main.yml
index beabf6a13f..41af4cca48 100644
--- a/roles/mailman3/tasks/main.yml
+++ b/roles/mailman3/tasks/main.yml
@@ -130,15 +130,6 @@
     - logging
     - mailman
 
-- name: Mailman logging -- rotation
-  ansible.builtin.copy:
-    src: mailman3.logrotate.conf
-    dest: /etc/logrotate.d/mailman3
-    mode: "0644"
-  tags:
-    - logging
-    - mailman
-
 - name: Ensuring mailman-core is started
   ansible.builtin.service:
     name: mailman3
@@ -533,19 +524,6 @@
     - systemd
     - hyperkitty
 
-#
-# Logrotate
-#
-
-- name: Setup logrotate
-  ansible.builtin.template:
-    src: "mailman.logrotate.j2"
-    dest: /etc/logrotate.d/mailman
-    mode: "0644"
-  tags:
-  - logrotate
-  - config
-
 #
 # Scripts
 #
diff --git a/roles/mailman3/templates/mailman.logrotate.j2 b/roles/mailman3/templates/mailman.logrotate.j2
deleted file mode 100644
index 97dc164b93..0000000000
--- a/roles/mailman3/templates/mailman.logrotate.j2
+++ /dev/null
@@ -1,13 +0,0 @@
-{{ mailman_log_directory }}/*log {
-    daily
-    rotate 7
-    missingok
-    ifempty
-    compress
-    compresscmd /usr/bin/xz
-    uncompresscmd /usr/bin/xz
-    compressext .xz
-    dateext
-    sharedscripts
-    copytruncate
-}