From 3d74c3a3c393a4bf224aface32e06dbe5064e440 Mon Sep 17 00:00:00 2001 From: Pablo Escobar Date: Wed, 13 May 2020 13:44:40 +0200 Subject: [PATCH 1/3] fix override of var filebeat_module_folder --- roles/wazuh/ansible-filebeat/tasks/main.yml | 32 +++++++++++---------- 1 file changed, 17 insertions(+), 15 deletions(-) diff --git a/roles/wazuh/ansible-filebeat/tasks/main.yml b/roles/wazuh/ansible-filebeat/tasks/main.yml index 4948c252..496a7687 100644 --- a/roles/wazuh/ansible-filebeat/tasks/main.yml +++ b/roles/wazuh/ansible-filebeat/tasks/main.yml @@ -67,25 +67,26 @@ - name: Checking if Filebeat Module folder file exists stat: path: "{{ filebeat_module_folder }}" - register: filebeat_module_folder + register: filebeat_module_folder_info +- name: Download, uncompress and apply permissions for Filebeat + block: -- name: Download Filebeat module package - get_url: - url: "{{ filebeat_module_package_url }}/{{ filebeat_module_package_name }}" - dest: "{{ filebeat_module_package_path }}" - when: not filebeat_module_folder.stat.exists + - name: Download Filebeat module package + get_url: + url: "{{ filebeat_module_package_url }}/{{ filebeat_module_package_name }}" + dest: "{{ filebeat_module_package_path }}" -- name: Unpakcing Filebeat module package - unarchive: - src: "{{ filebeat_module_package_path }}/{{ filebeat_module_package_name }}" - dest: "{{ filebeat_module_destination }}" - remote_src: yes - when: not filebeat_module_folder.stat.exists + - name: Unpacking Filebeat module package + unarchive: + src: "{{ filebeat_module_package_path }}/{{ filebeat_module_package_name }}" + dest: "{{ filebeat_module_destination }}" + remote_src: yes -- name: Setting 0755 permission for Filebeat module folder - file: dest={{ filebeat_module_folder }} mode=u=rwX,g=rwX,o=rwX recurse=yes - when: not filebeat_module_folder.stat.exists + - name: Setting 0755 permission for Filebeat module folder + file: dest={{ filebeat_module_folder }} mode=u=rwX,g=rwX,o=rwX recurse=yes + + when: not filebeat_module_folder_info.stat.exists - name: Checking if Filebeat Module package file exists stat: @@ -99,6 +100,7 @@ path: "{{ filebeat_module_package_path }}/{{ filebeat_module_package_name }}" when: filebeat_module_package.stat.exists +- meta: end_play - import_tasks: config.yml when: filebeat_create_config notify: restart filebeat From e7bcd54a91a8d8d5f834a87c77ca2837d2a42be7 Mon Sep 17 00:00:00 2001 From: Pablo Escobar Date: Wed, 13 May 2020 14:32:09 +0200 Subject: [PATCH 2/3] remove leftover debug line --- roles/wazuh/ansible-filebeat/tasks/main.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/roles/wazuh/ansible-filebeat/tasks/main.yml b/roles/wazuh/ansible-filebeat/tasks/main.yml index 496a7687..33eec3c3 100644 --- a/roles/wazuh/ansible-filebeat/tasks/main.yml +++ b/roles/wazuh/ansible-filebeat/tasks/main.yml @@ -100,7 +100,6 @@ path: "{{ filebeat_module_package_path }}/{{ filebeat_module_package_name }}" when: filebeat_module_package.stat.exists -- meta: end_play - import_tasks: config.yml when: filebeat_create_config notify: restart filebeat From 607387383790047d60e9ac5d63a309ccd73d0b2a Mon Sep 17 00:00:00 2001 From: Pablo Escobar Date: Wed, 13 May 2020 15:53:43 +0200 Subject: [PATCH 3/3] apply permissions 0755 --- roles/wazuh/ansible-filebeat/tasks/main.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/roles/wazuh/ansible-filebeat/tasks/main.yml b/roles/wazuh/ansible-filebeat/tasks/main.yml index 33eec3c3..34f74f42 100644 --- a/roles/wazuh/ansible-filebeat/tasks/main.yml +++ b/roles/wazuh/ansible-filebeat/tasks/main.yml @@ -84,7 +84,10 @@ remote_src: yes - name: Setting 0755 permission for Filebeat module folder - file: dest={{ filebeat_module_folder }} mode=u=rwX,g=rwX,o=rwX recurse=yes + file: + path: "{{ filebeat_module_folder }}" + mode: 0755 + recurse: yes when: not filebeat_module_folder_info.stat.exists