From f05a6aa25cf4f7678d2a6d73bec25cd4b8803da2 Mon Sep 17 00:00:00 2001 From: William Hirigoyen Date: Fri, 31 May 2024 10:12:05 +0200 Subject: [PATCH] log2mail: task log2mail.yml of evolinux-base converted to a role --- CHANGELOG.md | 2 ++ evolinux-base/handlers/main.yml | 5 ----- evolinux-base/tasks/main.yml | 3 ++- {evolinux-base => log2mail}/files/log2mail.service | 0 log2mail/handlers/main.yml | 5 +++++ .../tasks/log2mail.yml => log2mail/tasks/main.yml | 12 +----------- .../templates}/evolinux-defaults.j2 | 0 7 files changed, 10 insertions(+), 17 deletions(-) rename {evolinux-base => log2mail}/files/log2mail.service (100%) create mode 100644 log2mail/handlers/main.yml rename evolinux-base/tasks/log2mail.yml => log2mail/tasks/main.yml (85%) rename {evolinux-base/templates/log2mail => log2mail/templates}/evolinux-defaults.j2 (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 71879157..5523e903 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -19,6 +19,8 @@ The **patch** part is incremented if multiple releases happen the same month ### Changed +* log2mail: task log2mail.yml of evolinux-base converted to a role + ### Fixed ### Removed diff --git a/evolinux-base/handlers/main.yml b/evolinux-base/handlers/main.yml index b9211532..65349d95 100644 --- a/evolinux-base/handlers/main.yml +++ b/evolinux-base/handlers/main.yml @@ -74,11 +74,6 @@ name: postfix state: reloaded -- name: restart log2mail - ansible.builtin.service: - name: log2mail - state: restarted - - name: restart systemd-journald ansible.builtin.service: name: systemd-journald.service diff --git a/evolinux-base/tasks/main.yml b/evolinux-base/tasks/main.yml index 5571cde7..41314e6b 100644 --- a/evolinux-base/tasks/main.yml +++ b/evolinux-base/tasks/main.yml @@ -116,7 +116,8 @@ when: evolinux_provider_orange_fce_include | bool - name: Override Log2mail service - ansible.builtin.import_tasks: log2mail.yml + ansible.builtin.include_role: + name: evolix/log2mail when: evolinux_log2mail_include | bool - ansible.builtin.import_tasks: motd.yml diff --git a/evolinux-base/files/log2mail.service b/log2mail/files/log2mail.service similarity index 100% rename from evolinux-base/files/log2mail.service rename to log2mail/files/log2mail.service diff --git a/log2mail/handlers/main.yml b/log2mail/handlers/main.yml new file mode 100644 index 00000000..0292fe9d --- /dev/null +++ b/log2mail/handlers/main.yml @@ -0,0 +1,5 @@ +--- +- name: restart log2mail + ansible.builtin.service: + name: log2mail + state: restarted diff --git a/evolinux-base/tasks/log2mail.yml b/log2mail/tasks/main.yml similarity index 85% rename from evolinux-base/tasks/log2mail.yml rename to log2mail/tasks/main.yml index 8ffb6f9e..e617cbbc 100644 --- a/evolinux-base/tasks/log2mail.yml +++ b/log2mail/tasks/main.yml @@ -4,15 +4,11 @@ src: log2mail.service dest: /etc/systemd/system/log2mail.service mode: "0644" - tags: - - log2mail - name: Remove log2mail sysvinit service ansible.builtin.file: path: /etc/init.d/log2mail state: absent - tags: - - log2mail - name: Enable and start log2mail service ansible.builtin.systemd: @@ -20,8 +16,6 @@ daemon-reload: yes state: started enabled: yes - tags: - - log2mail - name: log2mail evolinux config is absent from default config ansible.builtin.blockinfile: @@ -29,18 +23,14 @@ marker: "# {mark} ANSIBLE MANAGED RULES FOR DEFAULT INSTANCE" state: absent notify: restart log2mail - tags: - - log2mail - name: log2mail evolinux-defaults config is present ansible.builtin.template: - src: log2mail/evolinux-defaults.j2 + src: evolinux-defaults.j2 dest: /etc/log2mail/config/evolinux-defaults owner: log2mail group: adm mode: "0640" force: yes notify: restart log2mail - tags: - - log2mail diff --git a/evolinux-base/templates/log2mail/evolinux-defaults.j2 b/log2mail/templates/evolinux-defaults.j2 similarity index 100% rename from evolinux-base/templates/log2mail/evolinux-defaults.j2 rename to log2mail/templates/evolinux-defaults.j2