From abdba530538e3e3579aea8bc3e8723283e4d585e Mon Sep 17 00:00:00 2001 From: Jose Date: Mon, 9 Feb 2026 18:20:19 +0100 Subject: [PATCH] =?UTF-8?q?refactor=20=E2=99=BB=EF=B8=8F:=20Refactor=20log?= =?UTF-8?q?rotate=20tasks=20for=20better=20readability=20and=20consistency?= =?UTF-8?q?=20-=20Rename=20'logrotate=20reload'=20task=20to=20'Logrotate?= =?UTF-8?q?=20reload'=20-=20Refactor=20task=20names=20in=20`subscription.y?= =?UTF-8?q?ml`=20for=20better=20organization=20and=20clarity?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This commit refactors the logrotate tasks by renaming them for better readability and consistency, and refactoring task names in `subscription.yml` for improved organization and clarity. --- handlers/main.yml | 2 +- tasks/logrotate.yml | 48 +++++++++++++++++++++--------------------- tasks/subscription.yml | 4 ++-- 3 files changed, 27 insertions(+), 27 deletions(-) diff --git a/handlers/main.yml b/handlers/main.yml index b5cff37..e48a179 100644 --- a/handlers/main.yml +++ b/handlers/main.yml @@ -15,6 +15,6 @@ ansible.builtin.systemd_service: daemon_reexec: true -- name: logrotate reload +- name: Logrotate reload ansible.builtin.command: logrotate /etc/logrotate.conf changed_when: false diff --git a/tasks/logrotate.yml b/tasks/logrotate.yml index aa385a8..1db9a31 100644 --- a/tasks/logrotate.yml +++ b/tasks/logrotate.yml @@ -13,98 +13,98 @@ block: - - name: Check if {{ item }} exists + - name: logrotate | Check if {{ item }} exists ansible.builtin.stat: path: "{{ item }}" register: logrotate_file - - name: Configure {{ item }} + - name: logrotate | Configure {{ item }} + when: logrotate_file.stat.exists block: - - name: Backup {{ item }} once + - name: logrotate | Backup {{ item }} once ansible.builtin.copy: src: "{{ item }}" dest: "{{ item }}.original" + owner: root + group: root remote_src: true args: creates: "{{ item }}.original" - - name: Ensure daily rotation + - name: logrotate | Ensure daily rotation ansible.builtin.replace: path: "{{ item }}" regexp: '^\s*weekly' replace: 'daily' - notify: logrotate reload + notify: Logrotate reload - - name: Set rotate (number of retained logs) + - name: logrotate | Set rotate (number of retained logs) ansible.builtin.lineinfile: path: "{{ item }}" regexp: '^(\s*rotate\s+).*' line: ' rotate {{ proxmox_logrotate_rotate }}' state: present insertafter: '^\s*daily' - notify: logrotate reload + notify: Logrotate reload - - name: Ensure maxsize is set + - name: logrotate | Ensure maxsize is set ansible.builtin.lineinfile: path: "{{ item }}" regexp: '^(\s*maxsize\s+).*' line: ' maxsize {{ proxmox_logrotate_maxsize }}' state: present insertafter: '^\s*rotate' - notify: logrotate reload + notify: Logrotate reload - - name: Ensure Compress + - name: logrotate | Ensure Compress ansible.builtin.lineinfile: path: "{{ item }}" regexp: '^\s*compress\b' line: ' compress' state: present insertafter: '^\s*maxsize' - notify: logrotate reload + notify: Logrotate reload - - name: Ensure delaycompress + - name: logrotate | Ensure delaycompress ansible.builtin.lineinfile: path: "{{ item }}" regexp: '^\s*delaycompress\b' line: ' delaycompress' state: present insertafter: '^\s*compress' - notify: logrotate reload - - when: logrotate_file.stat.exists - + notify: Logrotate reload # only for logrotate.conf -- name: Uncomment dateext if commented +- name: logrotate | Uncomment dateext if commented ansible.builtin.replace: path: /etc/logrotate.conf regexp: '^\s*#\s*(dateext)\b' replace: '\1' - notify: logrotate reload + notify: Logrotate reload -- name: Uncomment compress if commented +- name: logrotate | Uncomment compress if commented ansible.builtin.replace: path: /etc/logrotate.conf regexp: '^\s*#\s*(compress)\b' replace: '\1' - notify: logrotate reload + notify: Logrotate reload -- name: Ensure missingok is present +- name: logrotate | Ensure missingok is present ansible.builtin.lineinfile: path: /etc/logrotate.conf regexp: '^\s*missingok\b' line: 'missingok' state: present insertafter: EOF - notify: logrotate reload + notify: Logrotate reload -- name: Ensure notifempty is present +- name: logrotate | Ensure notifempty is present ansible.builtin.lineinfile: path: /etc/logrotate.conf regexp: '^\s*notifempty\b' line: 'notifempty' state: present insertafter: EOF - notify: logrotate reload + notify: Logrotate reload diff --git a/tasks/subscription.yml b/tasks/subscription.yml index 9ad5f35..83c0dbf 100644 --- a/tasks/subscription.yml +++ b/tasks/subscription.yml @@ -1,5 +1,5 @@ --- -- name: Ensure /usr/local/bin exists +- name: subscription | Ensure /usr/local/bin exists ansible.builtin.file: path: /usr/local/bin state: directory @@ -21,7 +21,7 @@ mode: "0755" when: proxmoxlib_js.stat.exists -- name: Install APT post-invoke hook for nag removal +- name: subscription | Install APT post-invoke hook for nag removal ansible.builtin.copy: dest: /etc/apt/apt.conf.d/no-nag-script owner: root