From 2c1db6a2224bfabf0890146aa7e814961996bba8 Mon Sep 17 00:00:00 2001
From: William Hirigoyen <whirigoyen+git@evolix.fr>
Date: Tue, 21 Feb 2023 17:55:46 +0100
Subject: [PATCH] userlogrotate: create role separated from packweb-apache

---
 CHANGELOG.md                                  |  1 +
 packweb-apache/tasks/main.yml                 | 16 ++-------
 packweb-apache/tasks/update_userlogrotate.yml | 16 ---------
 .../files/userlogrotate                       |  0
 .../files/userlogrotate_jessie                |  0
 userlogrotate/tasks/main.yml                  | 34 +++++++++++++++++++
 6 files changed, 38 insertions(+), 29 deletions(-)
 delete mode 100644 packweb-apache/tasks/update_userlogrotate.yml
 rename {packweb-apache => userlogrotate}/files/userlogrotate (100%)
 rename {packweb-apache => userlogrotate}/files/userlogrotate_jessie (100%)
 create mode 100644 userlogrotate/tasks/main.yml

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7d8d1c6c..ae6a202c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,6 +16,7 @@ The **patch** part changes is incremented if multiple releases happen the same m
 * nagios-nrpe: add tasks/files for a wrapper
 * fail2ban: add "Internal login failure" to Dovecot filter
 * php: add a way to choose which version to install using sury repository
+* userlogrotate: create role separated from packweb-apache
 
 ### Changed
 
diff --git a/packweb-apache/tasks/main.yml b/packweb-apache/tasks/main.yml
index ff3cd9a7..c0a44935 100644
--- a/packweb-apache/tasks/main.yml
+++ b/packweb-apache/tasks/main.yml
@@ -65,19 +65,8 @@
     - access.log
     - error.log
 
-- name: "Install userlogrotate (jessie)"
-  copy:
-    src: userlogrotate_jessie
-    dest: /etc/cron.weekly/userlogrotate
-    mode: "0755"
-  when: ansible_distribution_release == "jessie"
-
-- name: "Install userlogrotate (Debian 9 or later)"
-  copy:
-    src: userlogrotate
-    dest: /etc/cron.weekly/userlogrotate
-    mode: "0755"
-  when: ansible_distribution_major_version is version('9', '>=')
+- include_role:
+    name: userlogrotate
 
 - name: Force DIR_MODE to 0750 in /etc/adduser.conf
   lineinfile:
@@ -102,3 +91,4 @@
 
 - include: multiphp.yml
   when: packweb_multiphp_versions | length > 0
+
diff --git a/packweb-apache/tasks/update_userlogrotate.yml b/packweb-apache/tasks/update_userlogrotate.yml
deleted file mode 100644
index 1e8a6d85..00000000
--- a/packweb-apache/tasks/update_userlogrotate.yml
+++ /dev/null
@@ -1,16 +0,0 @@
----
-
-- name: "Cherche l'emplacement de userlogrotate"
-  ansible.builtin.find:
-    path: /etc
-    patterns: userlogrotate
-  register: find_logrotate
-
-- name: "Met-à-jour userlogrotate"
-  ansible.builtin.copy:
-    src: userlogrotate
-    dest: "{{ item }}"
-    mode: "0755"
-  loop: "{{ find_logrotate.files }}"
-  when: find_logrotate.files | length>0
-
diff --git a/packweb-apache/files/userlogrotate b/userlogrotate/files/userlogrotate
similarity index 100%
rename from packweb-apache/files/userlogrotate
rename to userlogrotate/files/userlogrotate
diff --git a/packweb-apache/files/userlogrotate_jessie b/userlogrotate/files/userlogrotate_jessie
similarity index 100%
rename from packweb-apache/files/userlogrotate_jessie
rename to userlogrotate/files/userlogrotate_jessie
diff --git a/userlogrotate/tasks/main.yml b/userlogrotate/tasks/main.yml
new file mode 100644
index 00000000..2642186c
--- /dev/null
+++ b/userlogrotate/tasks/main.yml
@@ -0,0 +1,34 @@
+---
+- name: "Is userlogrotate present ?"
+  ansible.builtin.find:
+    paths: ["/etc/cron.weekly", "/etc/cron.daily"]
+    patterns: ["userlogrotate"]
+  register: find_logrotate
+  check_mode: no
+
+- name: "Update userlogrotate"
+  ansible.builtin.copy:
+    src: userlogrotate
+    dest: "{{ item.path }}"
+    mode: "0755"
+  loop: "{{ find_logrotate.files }}"
+  when: find_logrotate.files | length>0
+
+- name: "Install userlogrotate (jessie)"
+  copy:
+    src: userlogrotate_jessie
+    dest: /etc/cron.weekly/userlogrotate
+    mode: "0755"
+  when:
+    - ansible_distribution_release == "jessie"
+    - find_logrotate.files | length==0
+
+- name: "Install userlogrotate (Debian 9 or later)"
+  copy:
+    src: userlogrotate
+    dest: /etc/cron.weekly/userlogrotate
+    mode: "0755"
+  when:
+    - ansible_distribution_major_version is version('9', '>=')
+    - find_logrotate.files | length==0
+