diff --git a/README.md b/README.md index 4f73f1d8..e1838aa5 100644 --- a/README.md +++ b/README.md @@ -82,7 +82,7 @@ The hereunder example playbook uses the `wazuh-ansible` role to provision a prod # Certificates generation - hosts: wi1 roles: - - role: ../roles/opensearch/wazuh-indexer + - role: ../roles/wazuh/wazuh-indexer indexer_network_host: "{{ private_ip }}" indexer_cluster_nodes: - "{{ hostvars.wi1.private_ip }}" @@ -130,7 +130,7 @@ The hereunder example playbook uses the `wazuh-ansible` role to provision a prod - hosts: wi_cluster strategy: free roles: - - role: ../roles/opensearch/wazuh-indexer + - role: ../roles/wazuh/wazuh-indexer indexer_network_host: "{{ private_ip }}" become: yes become_user: root @@ -237,8 +237,8 @@ The hereunder example playbook uses the `wazuh-ansible` role to provision a prod #Indexer+Dashboard node - hosts: dashboard roles: - - role: "../roles/opensearch/wazuh-indexer" - - role: "../roles/opensearch/wazuh-dashboard" + - role: "../roles/wazuh/wazuh-indexer" + - role: "../roles/wazuh/wazuh-dashboard" become: yes become_user: root vars: @@ -336,7 +336,7 @@ The hereunder example playbook uses the `wazuh-ansible` role to provision a sing # Certificates generation - hosts: aio roles: - - role: ../roles/opensearch/wazuh-indexer + - role: ../roles/wazuh/wazuh-indexer perform_installation: false become: no #become_user: root @@ -354,10 +354,10 @@ The hereunder example playbook uses the `wazuh-ansible` role to provision a sing become: yes become_user: root roles: - - role: ../roles/opensearch/wazuh-indexer + - role: ../roles/wazuh/wazuh-indexer - role: ../roles/wazuh/ansible-wazuh-manager - role: ../roles/wazuh/ansible-filebeat-oss - - role: ../roles/opensearch/wazuh-dashboard + - role: ../roles/wazuh/wazuh-dashboard vars: single_node: true minimum_master_nodes: 1 diff --git a/playbooks/wazuh-opensearch-dashboard.yml b/playbooks/wazuh-dashboard.yml similarity index 63% rename from playbooks/wazuh-opensearch-dashboard.yml rename to playbooks/wazuh-dashboard.yml index 2abc311f..5a50cbab 100644 --- a/playbooks/wazuh-opensearch-dashboard.yml +++ b/playbooks/wazuh-dashboard.yml @@ -1,6 +1,6 @@ --- - hosts: wi1 roles: - - role: ../roles/opensearch/wazuh-dashboard + - role: ../roles/wazuh/wazuh-dashboard vars: ansible_shell_allow_world_readable_temp: true diff --git a/playbooks/wazuh-opensearch.yml b/playbooks/wazuh-indexer.yml similarity index 89% rename from playbooks/wazuh-opensearch.yml rename to playbooks/wazuh-indexer.yml index c6839efa..34d999c4 100644 --- a/playbooks/wazuh-opensearch.yml +++ b/playbooks/wazuh-indexer.yml @@ -1,7 +1,7 @@ --- - hosts: wi_cluster roles: - - role: ../roles/opensearch/wazuh-indexer + - role: ../roles/wazuh/wazuh-indexer vars: instances: # A certificate will be generated for every node using the name as CN. diff --git a/playbooks/wazuh-opensearch-production-ready.yml b/playbooks/wazuh-production-ready.yml similarity index 97% rename from playbooks/wazuh-opensearch-production-ready.yml rename to playbooks/wazuh-production-ready.yml index e52cfca7..57fb880f 100644 --- a/playbooks/wazuh-opensearch-production-ready.yml +++ b/playbooks/wazuh-production-ready.yml @@ -2,7 +2,7 @@ # Certificates generation - hosts: wi1 roles: - - role: ../roles/opensearch/wazuh-indexer + - role: ../roles/wazuh/wazuh-indexer indexer_network_host: "{{ private_ip }}" indexer_cluster_nodes: - "{{ hostvars.wi1.private_ip }}" @@ -50,7 +50,7 @@ - hosts: wi_cluster strategy: free roles: - - role: ../roles/opensearch/wazuh-indexer + - role: ../roles/wazuh/wazuh-indexer indexer_network_host: "{{ private_ip }}" become: yes become_user: root @@ -157,8 +157,8 @@ #Indexer+Dashboard node - hosts: dashboard roles: - - role: "../roles/opensearch/wazuh-indexer" - - role: "../roles/opensearch/wazuh-dashboard" + - role: "../roles/wazuh/wazuh-indexer" + - role: "../roles/wazuh/wazuh-dashboard" become: yes become_user: root vars: diff --git a/playbooks/wazuh-opensearch-single.yml b/playbooks/wazuh-single.yml similarity index 86% rename from playbooks/wazuh-opensearch-single.yml rename to playbooks/wazuh-single.yml index 10e36107..38499f5c 100644 --- a/playbooks/wazuh-opensearch-single.yml +++ b/playbooks/wazuh-single.yml @@ -2,7 +2,7 @@ # Certificates generation - hosts: aio roles: - - role: ../roles/opensearch/wazuh-indexer + - role: ../roles/wazuh/wazuh-indexer perform_installation: false become: no #become_user: root @@ -20,10 +20,10 @@ become: yes become_user: root roles: - - role: ../roles/opensearch/wazuh-indexer + - role: ../roles/wazuh/wazuh-indexer - role: ../roles/wazuh/ansible-wazuh-manager - role: ../roles/wazuh/ansible-filebeat-oss - - role: ../roles/opensearch/wazuh-dashboard + - role: ../roles/wazuh/wazuh-dashboard vars: single_node: true minimum_master_nodes: 1 diff --git a/roles/opensearch/wazuh-dashboard/defaults/main.yml b/roles/wazuh/wazuh-dashboard/defaults/main.yml similarity index 100% rename from roles/opensearch/wazuh-dashboard/defaults/main.yml rename to roles/wazuh/wazuh-dashboard/defaults/main.yml diff --git a/roles/opensearch/wazuh-dashboard/handlers/main.yml b/roles/wazuh/wazuh-dashboard/handlers/main.yml similarity index 100% rename from roles/opensearch/wazuh-dashboard/handlers/main.yml rename to roles/wazuh/wazuh-dashboard/handlers/main.yml diff --git a/roles/opensearch/wazuh-dashboard/tasks/Debian.yml b/roles/wazuh/wazuh-dashboard/tasks/Debian.yml similarity index 100% rename from roles/opensearch/wazuh-dashboard/tasks/Debian.yml rename to roles/wazuh/wazuh-dashboard/tasks/Debian.yml diff --git a/roles/opensearch/wazuh-dashboard/tasks/RMRedHat.yml b/roles/wazuh/wazuh-dashboard/tasks/RMRedHat.yml similarity index 100% rename from roles/opensearch/wazuh-dashboard/tasks/RMRedHat.yml rename to roles/wazuh/wazuh-dashboard/tasks/RMRedHat.yml diff --git a/roles/opensearch/wazuh-dashboard/tasks/RedHat.yml b/roles/wazuh/wazuh-dashboard/tasks/RedHat.yml similarity index 100% rename from roles/opensearch/wazuh-dashboard/tasks/RedHat.yml rename to roles/wazuh/wazuh-dashboard/tasks/RedHat.yml diff --git a/roles/opensearch/wazuh-dashboard/tasks/main.yml b/roles/wazuh/wazuh-dashboard/tasks/main.yml similarity index 100% rename from roles/opensearch/wazuh-dashboard/tasks/main.yml rename to roles/wazuh/wazuh-dashboard/tasks/main.yml diff --git a/roles/opensearch/wazuh-dashboard/tasks/security_actions.yml b/roles/wazuh/wazuh-dashboard/tasks/security_actions.yml similarity index 100% rename from roles/opensearch/wazuh-dashboard/tasks/security_actions.yml rename to roles/wazuh/wazuh-dashboard/tasks/security_actions.yml diff --git a/roles/opensearch/wazuh-dashboard/templates/opensearch_dashboards.yml.j2 b/roles/wazuh/wazuh-dashboard/templates/opensearch_dashboards.yml.j2 similarity index 100% rename from roles/opensearch/wazuh-dashboard/templates/opensearch_dashboards.yml.j2 rename to roles/wazuh/wazuh-dashboard/templates/opensearch_dashboards.yml.j2 diff --git a/roles/opensearch/wazuh-dashboard/templates/wazuh.yml.j2 b/roles/wazuh/wazuh-dashboard/templates/wazuh.yml.j2 similarity index 100% rename from roles/opensearch/wazuh-dashboard/templates/wazuh.yml.j2 rename to roles/wazuh/wazuh-dashboard/templates/wazuh.yml.j2 diff --git a/roles/opensearch/wazuh-dashboard/vars/debian.yml b/roles/wazuh/wazuh-dashboard/vars/debian.yml similarity index 100% rename from roles/opensearch/wazuh-dashboard/vars/debian.yml rename to roles/wazuh/wazuh-dashboard/vars/debian.yml diff --git a/roles/opensearch/wazuh-indexer/defaults/main.yml b/roles/wazuh/wazuh-indexer/defaults/main.yml similarity index 100% rename from roles/opensearch/wazuh-indexer/defaults/main.yml rename to roles/wazuh/wazuh-indexer/defaults/main.yml diff --git a/roles/opensearch/wazuh-indexer/handlers/main.yml b/roles/wazuh/wazuh-indexer/handlers/main.yml similarity index 100% rename from roles/opensearch/wazuh-indexer/handlers/main.yml rename to roles/wazuh/wazuh-indexer/handlers/main.yml diff --git a/roles/opensearch/wazuh-indexer/meta/main.yml b/roles/wazuh/wazuh-indexer/meta/main.yml similarity index 100% rename from roles/opensearch/wazuh-indexer/meta/main.yml rename to roles/wazuh/wazuh-indexer/meta/main.yml diff --git a/roles/opensearch/wazuh-indexer/tasks/Debian.yml b/roles/wazuh/wazuh-indexer/tasks/Debian.yml similarity index 100% rename from roles/opensearch/wazuh-indexer/tasks/Debian.yml rename to roles/wazuh/wazuh-indexer/tasks/Debian.yml diff --git a/roles/opensearch/wazuh-indexer/tasks/RMRedHat.yml b/roles/wazuh/wazuh-indexer/tasks/RMRedHat.yml similarity index 100% rename from roles/opensearch/wazuh-indexer/tasks/RMRedHat.yml rename to roles/wazuh/wazuh-indexer/tasks/RMRedHat.yml diff --git a/roles/opensearch/wazuh-indexer/tasks/RedHat.yml b/roles/wazuh/wazuh-indexer/tasks/RedHat.yml similarity index 100% rename from roles/opensearch/wazuh-indexer/tasks/RedHat.yml rename to roles/wazuh/wazuh-indexer/tasks/RedHat.yml diff --git a/roles/opensearch/wazuh-indexer/tasks/local_actions.yml b/roles/wazuh/wazuh-indexer/tasks/local_actions.yml similarity index 100% rename from roles/opensearch/wazuh-indexer/tasks/local_actions.yml rename to roles/wazuh/wazuh-indexer/tasks/local_actions.yml diff --git a/roles/opensearch/wazuh-indexer/tasks/main.yml b/roles/wazuh/wazuh-indexer/tasks/main.yml similarity index 100% rename from roles/opensearch/wazuh-indexer/tasks/main.yml rename to roles/wazuh/wazuh-indexer/tasks/main.yml diff --git a/roles/opensearch/wazuh-indexer/tasks/security_actions.yml b/roles/wazuh/wazuh-indexer/tasks/security_actions.yml similarity index 100% rename from roles/opensearch/wazuh-indexer/tasks/security_actions.yml rename to roles/wazuh/wazuh-indexer/tasks/security_actions.yml diff --git a/roles/opensearch/wazuh-indexer/templates/config.yml.j2 b/roles/wazuh/wazuh-indexer/templates/config.yml.j2 similarity index 100% rename from roles/opensearch/wazuh-indexer/templates/config.yml.j2 rename to roles/wazuh/wazuh-indexer/templates/config.yml.j2 diff --git a/roles/opensearch/wazuh-indexer/templates/disabledlog4j.options.j2 b/roles/wazuh/wazuh-indexer/templates/disabledlog4j.options.j2 similarity index 100% rename from roles/opensearch/wazuh-indexer/templates/disabledlog4j.options.j2 rename to roles/wazuh/wazuh-indexer/templates/disabledlog4j.options.j2 diff --git a/roles/opensearch/wazuh-indexer/templates/internal_users.yml.j2 b/roles/wazuh/wazuh-indexer/templates/internal_users.yml.j2 similarity index 100% rename from roles/opensearch/wazuh-indexer/templates/internal_users.yml.j2 rename to roles/wazuh/wazuh-indexer/templates/internal_users.yml.j2 diff --git a/roles/opensearch/wazuh-indexer/templates/jvm.options.j2 b/roles/wazuh/wazuh-indexer/templates/jvm.options.j2 similarity index 100% rename from roles/opensearch/wazuh-indexer/templates/jvm.options.j2 rename to roles/wazuh/wazuh-indexer/templates/jvm.options.j2 diff --git a/roles/opensearch/wazuh-indexer/templates/opensearch.yml.j2 b/roles/wazuh/wazuh-indexer/templates/opensearch.yml.j2 similarity index 100% rename from roles/opensearch/wazuh-indexer/templates/opensearch.yml.j2 rename to roles/wazuh/wazuh-indexer/templates/opensearch.yml.j2 diff --git a/roles/opensearch/wazuh-indexer/templates/tlsconfig.yml.j2 b/roles/wazuh/wazuh-indexer/templates/tlsconfig.yml.j2 similarity index 100% rename from roles/opensearch/wazuh-indexer/templates/tlsconfig.yml.j2 rename to roles/wazuh/wazuh-indexer/templates/tlsconfig.yml.j2