From 236e76f73d5e0840dde5fdd3491456f7f751e84e Mon Sep 17 00:00:00 2001 From: Carlos Dominguez <43823505+cadoming@users.noreply.github.com> Date: Mon, 14 Jan 2019 09:19:02 +0100 Subject: [PATCH] Fixes typos (#130) --- CHANGELOG.md | 1 + roles/wazuh/ansible-wazuh-manager/README.md | 4 ++-- roles/wazuh/ansible-wazuh-manager/tasks/main.yml | 8 ++++---- roles/wazuh/ansible-wazuh-manager/templates/agentless.j2 | 2 +- .../templates/var-ossec-etc-ossec-server.conf.j2 | 4 ++-- .../vars/{agentless_creeds.yml => agentless_creds.yml} | 2 +- 6 files changed, 11 insertions(+), 10 deletions(-) rename roles/wazuh/ansible-wazuh-manager/vars/{agentless_creeds.yml => agentless_creds.yml} (88%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 31c820e24..7aa2db9f2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,6 +16,7 @@ All notable changes to this project will be documented in this file. ### Fixed - Fixed a couple linting issues with yamllint and ansible-review ([#111](https://github.com/wazuh/wazuh-ansible/pull/111)) +- Fixes typos: The word credentials doesn't have two consecutive e's ([#130](https://github.com/wazuh/wazuh-ansible/pull/130)) - Fixed multiple remote connection ([#120](https://github.com/wazuh/wazuh-ansible/pull/120)) - Fixed null value for wazuh_manager_fqdn ([#132](https://github.com/wazuh/wazuh-ansible/pull/132)) diff --git a/roles/wazuh/ansible-wazuh-manager/README.md b/roles/wazuh/ansible-wazuh-manager/README.md index 271c9851f..19b1eae95 100644 --- a/roles/wazuh/ansible-wazuh-manager/README.md +++ b/roles/wazuh/ansible-wazuh-manager/README.md @@ -26,11 +26,11 @@ wazuh_agent_configs: [] Vault variables ---------------- -### vars/agentless_creeds.yml +### vars/agentless_creds.yml This file has the agenless credentials. ``` --- - agentless_creeds: + agentless_creds: - type: ssh_integrity_check_linux frequency: 3600 host: root@example.net diff --git a/roles/wazuh/ansible-wazuh-manager/tasks/main.yml b/roles/wazuh/ansible-wazuh-manager/tasks/main.yml index ad7f8cfaf..b1c6fcf26 100644 --- a/roles/wazuh/ansible-wazuh-manager/tasks/main.yml +++ b/roles/wazuh/ansible-wazuh-manager/tasks/main.yml @@ -168,7 +168,7 @@ - config - name: Retrieving Agentless Credentials - include_vars: agentless_creeds.yml + include_vars: agentless_creds.yml tags: - config @@ -231,7 +231,7 @@ notify: restart wazuh-manager when: - agentlessd_enabled.stdout == '0' or "skipped" in agentlessd_enabled.stdout - - agentless_creeds is defined + - agentless_creds is defined tags: - config @@ -324,13 +324,13 @@ group: root mode: 0644 no_log: true - when: agentless_creeds is defined + when: agentless_creds is defined tags: - config - name: Encode the secret shell: /usr/bin/base64 /var/ossec/agentless/.passlist_tmp > /var/ossec/agentless/.passlist && rm /var/ossec/agentless/.passlist_tmp - when: agentless_creeds is defined + when: agentless_creds is defined tags: - config diff --git a/roles/wazuh/ansible-wazuh-manager/templates/agentless.j2 b/roles/wazuh/ansible-wazuh-manager/templates/agentless.j2 index 2fa90bd79..99b209093 100644 --- a/roles/wazuh/ansible-wazuh-manager/templates/agentless.j2 +++ b/roles/wazuh/ansible-wazuh-manager/templates/agentless.j2 @@ -1,3 +1,3 @@ -{% for agentless in agentless_creeds %} +{% for agentless in agentless_creds %} {{ agentless.host }}|{{ agentless.passwd }} {% endfor %} diff --git a/roles/wazuh/ansible-wazuh-manager/templates/var-ossec-etc-ossec-server.conf.j2 b/roles/wazuh/ansible-wazuh-manager/templates/var-ossec-etc-ossec-server.conf.j2 index 6f389a71b..71201e925 100644 --- a/roles/wazuh/ansible-wazuh-manager/templates/var-ossec-etc-ossec-server.conf.j2 +++ b/roles/wazuh/ansible-wazuh-manager/templates/var-ossec-etc-ossec-server.conf.j2 @@ -382,8 +382,8 @@ {% endif %} -{% if agentless_creeds is defined %} -{% for agentless in agentless_creeds %} +{% if agentless_creds is defined %} +{% for agentless in agentless_creds %} {{ agentless.type }} {{ agentless.frequency }} diff --git a/roles/wazuh/ansible-wazuh-manager/vars/agentless_creeds.yml b/roles/wazuh/ansible-wazuh-manager/vars/agentless_creds.yml similarity index 88% rename from roles/wazuh/ansible-wazuh-manager/vars/agentless_creeds.yml rename to roles/wazuh/ansible-wazuh-manager/vars/agentless_creds.yml index 0a25988d6..2704fee11 100644 --- a/roles/wazuh/ansible-wazuh-manager/vars/agentless_creeds.yml +++ b/roles/wazuh/ansible-wazuh-manager/vars/agentless_creds.yml @@ -1,5 +1,5 @@ --- -# agentless_creeds: +# agentless_creds: # - type: ssh_integrity_check_linux # frequency: 3600 # host: root@example.net