Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix merge bugs #5

Merged
merged 2 commits into from
Jan 9, 2025
Merged

Fix merge bugs #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b36e552
Purge wazuh_manager_sources_installation
Alex-Welsh Jan 8, 2025
d7b9427
Fix use of ansible_system
Alex-Welsh Jan 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions roles/wazuh/ansible-wazuh-agent/tasks/Debian.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@
when:
- ansible_facts.distribution == "Ubuntu"
- ansible_facts.distribution_major_version | int == 14
- not wazuh_agent_sources_installation.enabled
- not wazuh_custom_packages_installation_agent_enabled

- name: Debian/Ubuntu | Download Wazuh repository key
Expand All @@ -61,7 +60,6 @@
mode: '0644'
when:
- not (ansible_facts.distribution == "Ubuntu" and ansible_facts.distribution_major_version | int == 14)
- not wazuh_agent_sources_installation.enabled
- not wazuh_custom_packages_installation_agent_enabled

- name: Debian/Ubuntu | Add Wazuh repositories
Expand Down
4 changes: 0 additions & 4 deletions roles/wazuh/ansible-wazuh-agent/tasks/Linux.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
lock_timeout: '{{ wazuh_agent_yum_lock_timeout }}'
when:
- ansible_facts.os_family|lower == "redhat"
- not wazuh_agent_sources_installation.enabled
- not wazuh_custom_packages_installation_agent_enabled
tags:
- init
Expand All @@ -28,7 +27,6 @@
cache_valid_time: 3600
when:
- ansible_facts.os_family|lower != "redhat"
- not wazuh_agent_sources_installation.enabled
- not wazuh_custom_packages_installation_agent_enabled
- not ansible_check_mode
tags:
Expand Down Expand Up @@ -267,9 +265,7 @@
- include_tasks: "RMRedHat.yml"
when:
- ansible_facts.os_family == "RedHat"
- not wazuh_agent_sources_installation.enabled

- include_tasks: "RMDebian.yml"
when:
- ansible_facts.os_family == "Debian"
- not wazuh_agent_sources_installation.enabled
1 change: 0 additions & 1 deletion roles/wazuh/ansible-wazuh-agent/tasks/RedHat.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
when:
- (ansible_facts['os_family']|lower == 'redhat') and (ansible_facts.distribution|lower != 'amazon')
- (ansible_facts.distribution_major_version|int <= 5)
- not wazuh_agent_sources_installation.enabled
- not wazuh_custom_packages_installation_agent_enabled
register: repo_v5_installed

Expand Down
4 changes: 2 additions & 2 deletions roles/wazuh/ansible-wazuh-agent/templates/var-ossec-etc-ossec-agent.conf.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
<config-profile>{{ wazuh_profile_ubuntu }}</config-profile>
{% endif %}
{% endif %}
{% if ansible_system == "Darwin" %}
{% if ansible_facts.system == "Darwin" %}
MoteHue marked this conversation as resolved.
Show resolved Hide resolved
<config-profile>{{ wazuh_profile_macos }}</config-profile>
{% endif %}
{% if wazuh_notify_time is not none and wazuh_time_reconnect is not none %}
Expand Down Expand Up @@ -67,7 +67,7 @@
{% if wazuh_agent_config.enrollment.agent_key_path | length > 0 %}
<agent_key_path>{{ wazuh_agent_config.enrollment.agent_key_path }}</agent_key_path>
{% endif %}
{% if wazuh_agent_config.enrollment.authorization_pass_path | length > 0 and ansible_system != "Darwin" %}
{% if wazuh_agent_config.enrollment.authorization_pass_path | length > 0 and ansible_facts.system != "Darwin" %}
<authorization_pass_path>{{ wazuh_agent_config.enrollment.authorization_pass_path }}</authorization_pass_path>
{% else %}
<authorization_pass_path>{{ wazuh_agent_config.enrollment.authorization_pass_path_macos }}</authorization_pass_path>
Expand Down
2 changes: 0 additions & 2 deletions roles/wazuh/ansible-wazuh-manager/tasks/Debian.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
when:
- ansible_facts.distribution == "Ubuntu"
- ansible_facts.distribution_major_version | int == 14
- not wazuh_manager_sources_installation.enabled
- not wazuh_custom_packages_installation_manager_enabled

- name: Debian/Ubuntu | Download Wazuh repository key
Expand All @@ -49,7 +48,6 @@
mode: '0644'
when:
- not (ansible_facts.distribution == "Ubuntu" and ansible_facts.distribution_major_version | int == 14)
- not wazuh_manager_sources_installation.enabled
- not wazuh_custom_packages_installation_manager_enabled

- name: Debian/Ubuntu | Add Wazuh repositories
Expand Down
2 changes: 0 additions & 2 deletions roles/wazuh/ansible-wazuh-manager/tasks/RedHat.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
when:
- (ansible_facts.os_family|lower == 'redhat') and (ansible_facts.distribution|lower != 'amazon')
- (ansible_facts.distribution_major_version|int <= 5)
- not wazuh_manager_sources_installation.enabled
- not wazuh_custom_packages_installation_manager_enabled
register: repo_v5_manager_installed

Expand Down Expand Up @@ -100,7 +99,6 @@
until: wazuh_manager_main_packages_installed is succeeded
when:
- ansible_facts.os_family|lower == "redhat"
- not wazuh_manager_sources_installation.enabled
- not wazuh_custom_packages_installation_manager_enabled
tags:
- init
Expand Down
Loading