From dbc6e6cd702111f20228bc90c7174b0c94a896e8 Mon Sep 17 00:00:00 2001 From: c-bordon Date: Fri, 28 Jun 2024 12:49:08 -0300 Subject: [PATCH] Changed macOS validation to a variable --- playbooks/wazuh-production-ready.yml | 1 + playbooks/wazuh-single.yml | 1 + roles/wazuh/wazuh-indexer/defaults/main.yml | 3 +++ .../wazuh/wazuh-indexer/tasks/local_actions.yml | 17 ++++++++--------- 4 files changed, 13 insertions(+), 9 deletions(-) diff --git a/playbooks/wazuh-production-ready.yml b/playbooks/wazuh-production-ready.yml index a6ea3097..1d0b4cc8 100644 --- a/playbooks/wazuh-production-ready.yml +++ b/playbooks/wazuh-production-ready.yml @@ -43,6 +43,7 @@ name: node-6 ip: "{{ hostvars.dashboard.private_ip }}" role: dashboard + macos_localhost: false tags: - generate-certs diff --git a/playbooks/wazuh-single.yml b/playbooks/wazuh-single.yml index 38499f5c..77017c72 100644 --- a/playbooks/wazuh-single.yml +++ b/playbooks/wazuh-single.yml @@ -13,6 +13,7 @@ name: node-1 # Important: must be equal to indexer_node_name. ip: 127.0.0.1 role: indexer + macos_localhost: false tags: - generate-certs # Single node diff --git a/roles/wazuh/wazuh-indexer/defaults/main.yml b/roles/wazuh/wazuh-indexer/defaults/main.yml index e1796da9..cbc3f65e 100644 --- a/roles/wazuh/wazuh-indexer/defaults/main.yml +++ b/roles/wazuh/wazuh-indexer/defaults/main.yml @@ -48,3 +48,6 @@ generate_certs: true perform_installation: true indexer_nolog_sensible: true + +# Docker image for certificates generation on macOS +wazuh_certs_tool_docker: "wazuh/wazuh-cert-tool:{{ indexer_version }}" diff --git a/roles/wazuh/wazuh-indexer/tasks/local_actions.yml b/roles/wazuh/wazuh-indexer/tasks/local_actions.yml index d8b63c79..b5575a2b 100644 --- a/roles/wazuh/wazuh-indexer/tasks/local_actions.yml +++ b/roles/wazuh/wazuh-indexer/tasks/local_actions.yml @@ -21,13 +21,12 @@ stat: path: "{{ local_certs_path }}/wazuh-certs-tool.sh" register: tool_package - when: ansible_os_family != 'Darwin' - name: Local action | Download certificates generation tool get_url: url: "{{ certs_gen_tool_url }}" dest: "{{ local_certs_path }}/wazuh-certs-tool.sh" - when: not tool_package.stat.exists and ansible_os_family != 'Darwin' + when: not tool_package.stat.exists and not macos_localhost - name: Local action | Prepare the certificates generation template file template: @@ -39,36 +38,36 @@ - name: Local action | Generate the node & admin certificates in local command: >- bash {{ local_certs_path }}/wazuh-certs-tool.sh -A - when: ansible_os_family != 'Darwin' + when: not macos_localhost - name: Local action | Check for Docker installation on macOS command: docker --version register: docker_check - when: ansible_os_family == 'Darwin' + when: macos_localhost ignore_errors: yes - name: Local action | Fail if Docker is not installed fail: msg: "Docker is not installed on this host." - when: (docker_check.rc | default(1)) != 0 and ansible_os_family == 'Darwin' + when: (docker_check.rc | default(1)) != 0 and macos_localhost - name: Local action | Run Docker container on macOS community.docker.docker_container: name: wazuh-cert-tool - image: "wazuh/wazuh-cert-tool" + image: "{{ wazuh_certs_tool_docker }}" state: started auto_remove: true volumes: - "{{ local_certs_path }}/config.yml:/config/certs.yml" - "{{ local_certs_path }}/wazuh-certificates/:/certificates/" - when: ansible_os_family == 'Darwin' + when: macos_localhost - name: Local action | Remove Docker image after execution community.docker.docker_image: - name: "wazuh/wazuh-cert-tool" + name: "{{ wazuh_certs_tool_docker }}" state: absent force_absent: yes - when: ansible_os_family == 'Darwin' + when: macos_localhost run_once: true delegate_to: localhost