diff --git a/roles/wazuh/ansible-wazuh-agent/templates/var-ossec-etc-ossec-agent.conf.j2 b/roles/wazuh/ansible-wazuh-agent/templates/var-ossec-etc-ossec-agent.conf.j2
index 4d43bc94..61c28012 100644
--- a/roles/wazuh/ansible-wazuh-agent/templates/var-ossec-etc-ossec-agent.conf.j2
+++ b/roles/wazuh/ansible-wazuh-agent/templates/var-ossec-etc-ossec-agent.conf.j2
@@ -1,4 +1,4 @@
-#jinja2: trim_blocks: False
+#jinja2: lstrip_blocks: True
{{ wazuh_agent_config.client_buffer.disable }}
{{ wazuh_agent_config.client_buffer.queue_size }}
{{ wazuh_agent_config.client_buffer.events_per_sec }}
+
{{ wazuh_agent_config.log_format }}
@@ -72,7 +72,6 @@
{% endif %}
yes
{% endif %}
-
{% if ansible_os_family == "Windows" %}
./shared/win_audit_rcl.txt
./shared/win_applications_rcl.txt
@@ -86,11 +85,11 @@
{% if wazuh_agent_config.syscheck is defined %}
no
-
+
{{ wazuh_agent_config.syscheck.frequency }}
{% if ansible_system == "Linux" %}
-
+
/etc,/usr/bin,/usr/sbin
/bin,/sbin,/boot
@@ -130,7 +129,7 @@
{% for no_diff in wazuh_agent_config.syscheck.no_diff %}
{{ no_diff }}
{% endfor %}
-
+
{{ wazuh_agent_config.syscheck.skip_nfs }}
{% endif %}
@@ -270,29 +269,29 @@
{{ wazuh_agent_config.syscollector.processes }}
-
- {% if wazuh_agent_config.sca.enabled | length > 0 %}
- {{ wazuh_agent_config.sca.enabled }}
- {% endif %}
- {% if wazuh_agent_config.sca.scan_on_start | length > 0 %}
- {{ wazuh_agent_config.sca.scan_on_start }}
- {% endif %}
- {% if wazuh_agent_config.sca.interval | length > 0 %}
- {{ wazuh_agent_config.sca.interval }}
- {% endif %}
- {% if wazuh_agent_config.sca.skip_nfs | length > 0 %}
- yes
- {% endif %}
- {% if wazuh_agent_config.sca.day | length > 0 %}
- yes
- {% endif %}
- {% if wazuh_agent_config.sca.wday | length > 0 %}
- yes
- {% endif %}
- {% if wazuh_agent_config.sca.time | length > 0 %}
-
- {% endif %}
-
+
+ {% if wazuh_agent_config.sca.enabled | length > 0 %}
+ {{ wazuh_agent_config.sca.enabled }}
+ {% endif %}
+ {% if wazuh_agent_config.sca.scan_on_start | length > 0 %}
+ {{ wazuh_agent_config.sca.scan_on_start }}
+ {% endif %}
+ {% if wazuh_agent_config.sca.interval | length > 0 %}
+ {{ wazuh_agent_config.sca.interval }}
+ {% endif %}
+ {% if wazuh_agent_config.sca.skip_nfs | length > 0 %}
+ yes
+ {% endif %}
+ {% if wazuh_agent_config.sca.day | length > 0 %}
+ yes
+ {% endif %}
+ {% if wazuh_agent_config.sca.wday | length > 0 %}
+ yes
+ {% endif %}
+ {% if wazuh_agent_config.sca.time | length > 0 %}
+
+ {% endif %}
+
{% if ansible_system == "Linux" and wazuh_agent_config.vuls.disable == 'no' %}
@@ -306,68 +305,72 @@
{% endif %}
- {% if ansible_system == "Linux" %}
- {% for localfile in wazuh_agent_config.localfiles.linux %}
-
- {{ localfile.format }}
+ {% if ansible_system == "Linux" %}
+ {% for localfile in wazuh_agent_config.localfiles.linux %}
+
+
+ {{ localfile.format }}
{% if localfile.format == 'command' or localfile.format == 'full_command' %}
- {{ localfile.command }}
- {{ localfile.frequency }}
- {% if localfile.alias is defined %}
- {{ localfile.alias }}
- {% endif %}
- {% else %}
- {{ localfile.location }}
+ {{ localfile.command }}
+ {{ localfile.frequency }}
+ {% if localfile.alias is defined %}
+ {{ localfile.alias }}
{% endif %}
-
+ {% else %}
+ {{ localfile.location }}
+ {% endif %}
+
{% endfor %}
{% endif %}
- {% if ansible_os_family == "Debian" %}
- {% for localfile in wazuh_agent_config.localfiles.debian %}
-
- {{ localfile.format }}
+ {% if ansible_os_family == "Debian" %}
+ {% for localfile in wazuh_agent_config.localfiles.debian %}
+
+
+ {{ localfile.format }}
{% if localfile.format == 'command' or localfile.format == 'full_command' %}
- {{ localfile.command }}
- {{ localfile.frequency }}
- {% if localfile.alias is defined %}
- {{ localfile.alias }}
- {% endif %}
- {% else %}
- {{ localfile.location }}
- {% endif %}
-
+ {{ localfile.command }}
+ {{ localfile.frequency }}
+ {% if localfile.alias is defined %}
+ {{ localfile.alias }}
+ {% endif %}
+ {% else %}
+ {{ localfile.location }}
+ {% endif %}
+
{% endfor %}
{% endif %}
- {% if ansible_os_family == "RedHat" %}
- {% for localfile in wazuh_agent_config.localfiles.centos %}
-
- {{ localfile.format }}
+ {% if ansible_os_family == "RedHat" %}
+ {% for localfile in wazuh_agent_config.localfiles.centos %}
+
+
+ {{ localfile.format }}
{% if localfile.format == 'command' or localfile.format == 'full_command' %}
- {{ localfile.command }}
- {{ localfile.frequency }}
- {% if localfile.alias is defined %}
- {{ localfile.alias }}
- {% endif %}
+ {{ localfile.command }}
+ {{ localfile.frequency }}
+ {% if localfile.alias is defined %}
+ {{ localfile.alias }}
+ {% endif %}
{% else %}
- {{ localfile.location }}
- {% endif %}
-
+ {{ localfile.location }}
+ {% endif %}
+
{% endfor %}
{% endif %}
- {% if ansible_os_family == "Windows" %}
- {% for localfile in wazuh_agent_config.localfiles.windows %}
-
- {{ localfile.format }}
- {% if localfile.format == 'eventchannel' %}
- {{ localfile.location }}
- {{ localfile.query}}
- {% else %}
- {{ localfile.location }}
- {% endif %}
-
+ {% if ansible_os_family == "Windows" %}
+ {% for localfile in wazuh_agent_config.localfiles.windows %}
+
+
+ {{ localfile.format }}
+ {% if localfile.format == 'eventchannel' %}
+ {{ localfile.location }}
+ {{ localfile.query}}
+ {% else %}
+ {{ localfile.location }}
+ {% endif %}
+
{% endfor %}
{% endif %}
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 145af4af..733cae18 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
@@ -1,4 +1,4 @@
-#jinja2: trim_blocks: False
+#jinja2: lstrip_blocks: True
no
@@ -222,29 +231,29 @@
{{ wazuh_manager_config.syscollector.processes }}
-
- {% if wazuh_manager_config.sca.enabled | length > 0 %}
- {{ wazuh_manager_config.sca.enabled }}
- {% endif %}
- {% if wazuh_manager_config.sca.scan_on_start | length > 0 %}
- {{ wazuh_manager_config.sca.scan_on_start }}
- {% endif %}
- {% if wazuh_manager_config.sca.interval | length > 0 %}
- {{ wazuh_manager_config.sca.interval }}
- {% endif %}
- {% if wazuh_manager_config.sca.skip_nfs | length > 0 %}
- yes
- {% endif %}
- {% if wazuh_manager_config.sca.day | length > 0 %}
- yes
- {% endif %}
- {% if wazuh_manager_config.sca.wday | length > 0 %}
- yes
- {% endif %}
- {% if wazuh_manager_config.sca.time | length > 0 %}
-
- {% endif %}
-
+
+ {% if wazuh_manager_config.sca.enabled | length > 0 %}
+ {{ wazuh_manager_config.sca.enabled }}
+ {% endif %}
+ {% if wazuh_manager_config.sca.scan_on_start | length > 0 %}
+ {{ wazuh_manager_config.sca.scan_on_start }}
+ {% endif %}
+ {% if wazuh_manager_config.sca.interval | length > 0 %}
+ {{ wazuh_manager_config.sca.interval }}
+ {% endif %}
+ {% if wazuh_manager_config.sca.skip_nfs | length > 0 %}
+ yes
+ {% endif %}
+ {% if wazuh_manager_config.sca.day | length > 0 %}
+ yes
+ {% endif %}
+ {% if wazuh_manager_config.sca.wday | length > 0 %}
+ yes
+ {% endif %}
+ {% if wazuh_manager_config.sca.time | length > 0 %}
+
+ {% endif %}
+
{{ wazuh_manager_config.vul_detector.disable }}
@@ -297,7 +306,6 @@
{% for no_diff in wazuh_manager_config.syscheck.no_diff %}
{{ no_diff }}
{% endfor %}
-
{% if wazuh_manager_config.syscheck.skip_nfs is defined %}
{{ wazuh_manager_config.syscheck.skip_nfs }}
{% endif %}
@@ -319,53 +327,77 @@
{% endfor %}
- {% for command in wazuh_manager_config.commands %}
-
- {{ command.name }}
- {{ command.executable }}
- {{ command.expect }}
- {{ command.timeout_allowed }}
-
+{% for command in wazuh_manager_config.commands %}
+
+
+ {{ command.name }}
+ {{ command.executable }}
+ {{ command.expect }}
+ {{ command.timeout_allowed }}
+
+{% endfor %}
+
+
+
+ ruleset/decoders
+ ruleset/rules
+ {% if wazuh_manager_config.rule_exclude is defined %}
+ {% for rule in wazuh_manager_config.rule_exclude %}
+ {{ rule }}
{% endfor %}
+ {% endif %}
+ {% if cdb_lists is defined %}
+ {% for list in cdb_lists %}
+ etc/lists/{{ list.name }}
+ {% endfor %}
+ {% endif %}
-
-
- ruleset/decoders
- ruleset/rules
- {% if wazuh_manager_config.rule_exclude is defined %}
- {% for rule in wazuh_manager_config.rule_exclude %}
- {{ rule }}
- {% endfor %}
- {% endif %}
- {% if cdb_lists is defined %}
- {% for list in cdb_lists %}
- etc/lists/{{ list.name }}
- {% endfor %}
- {% endif %}
-
-
- etc/decoders
- etc/rules
+
+ etc/decoders
+ etc/rules
{% if wazuh_manager_config.authd.enable == true %}
no
- {% if wazuh_manager_config.authd.port is not none %}{{wazuh_manager_config.authd.port}}{% else %}1515{% endif %}
- {% if wazuh_manager_config.authd.use_source_ip is not none %}{{wazuh_manager_config.authd.use_source_ip}}{% endif %}
- {% if wazuh_manager_config.authd.force_insert is not none %}{{wazuh_manager_config.authd.force_insert}}{% endif %}
- {% if wazuh_manager_config.authd.force_time is not none %}{{wazuh_manager_config.authd.force_time}}{% endif %}
- {% if wazuh_manager_config.authd.purge is not none %}{{wazuh_manager_config.authd.purge}}{% endif %}
- {% if wazuh_manager_config.authd.use_password is not none %}{{wazuh_manager_config.authd.use_password}}{% endif %}
- {% if wazuh_manager_config.authd.ssl_agent_ca is not none %}/var/ossec/etc/{{wazuh_manager_config.authd.ssl_agent_ca | basename}}{% endif %}
- {% if wazuh_manager_config.authd.ssl_verify_host is not none %}{{wazuh_manager_config.authd.ssl_verify_host}}{% endif %}
- {% if wazuh_manager_config.authd.ssl_manager_cert is not none %}/var/ossec/etc/{{wazuh_manager_config.authd.ssl_manager_cert | basename}}{% endif %}
- {% if wazuh_manager_config.authd.ssl_manager_key is not none %}/var/ossec/etc/{{wazuh_manager_config.authd.ssl_manager_key | basename}}{% endif %}
- {% if wazuh_manager_config.authd.ssl_auto_negotiate is not none %}{{wazuh_manager_config.authd.ssl_auto_negotiate}}{% endif %}
+ {% if wazuh_manager_config.authd.port is not none %}
+ {{wazuh_manager_config.authd.port}}
+ {% else %}
+ 1515
+ {% endif %}
+ {% if wazuh_manager_config.authd.use_source_ip is not none %}
+ {{wazuh_manager_config.authd.use_source_ip}}
+ {% endif %}
+ {% if wazuh_manager_config.authd.force_insert is not none %}
+ {{wazuh_manager_config.authd.force_insert}}
+ {% endif %}
+ {% if wazuh_manager_config.authd.force_time is not none %}
+ {{wazuh_manager_config.authd.force_time}}
+ {% endif %}
+ {% if wazuh_manager_config.authd.purge is not none %}
+ {{wazuh_manager_config.authd.purge}}
+ {% endif %}
+ {% if wazuh_manager_config.authd.use_password is not none %}
+ {{wazuh_manager_config.authd.use_password}}
+ {% endif %}
+ {% if wazuh_manager_config.authd.ssl_agent_ca is not none %}
+ /var/ossec/etc/{{wazuh_manager_config.authd.ssl_agent_ca | basename}}
+ {% endif %}
+ {% if wazuh_manager_config.authd.ssl_verify_host is not none %}
+ {{wazuh_manager_config.authd.ssl_verify_host}}
+ {% endif %}
+ {% if wazuh_manager_config.authd.ssl_manager_cert is not none %}
+ /var/ossec/etc/{{wazuh_manager_config.authd.ssl_manager_cert | basename}}
+ {% endif %}
+ {% if wazuh_manager_config.authd.ssl_manager_key is not none %}
+ /var/ossec/etc/{{wazuh_manager_config.authd.ssl_manager_key | basename}}
+ {% endif %}
+ {% if wazuh_manager_config.authd.ssl_auto_negotiate is not none %}
+ {{wazuh_manager_config.authd.ssl_auto_negotiate}}
+ {% endif %}
{% endif %}
-
{{ wazuh_manager_config.cluster.disable }}
{{ wazuh_manager_config.cluster.name }}
@@ -385,7 +417,7 @@
{{ wazuh_manager_config.cluster.hidden }}
- {% if ansible_system == "Linux" and wazuh_manager_config.vuls.disable == 'no' %}
+{% if ansible_system == "Linux" and wazuh_manager_config.vuls.disable == 'no' %}
no
Wazuh-VULS
@@ -394,7 +426,7 @@
yes
{{ wazuh_manager_config.vuls.run_on_start }}
- {% endif %}
+{% endif -%}
{% if agentless_creds is defined %}
{% for agentless in agentless_creds %}
@@ -407,11 +439,8 @@
{{ agentless.arguments }}
{% endif %}
-
{% endfor %}
-{% endif %}
-
-
+{% endif -%}
{% if wazuh_manager_config.active_responses is defined %}
{% for response in wazuh_manager_config.active_responses %}
@@ -427,10 +456,11 @@
{%if response.repeated_offenders is defined %}{{ response.repeated_offenders }}{% endif %}
{% endfor %}
-{% endif %}
+{% endif -%}
{% for localfile in wazuh_manager_config.localfiles.common %}
+
{{ localfile.format }}
{% if localfile.format == 'command' or localfile.format == 'full_command' %}
@@ -468,6 +498,7 @@
{% if ansible_os_family == "Debian" %}
{% for localfile in wazuh_manager_config.localfiles.debian %}
+
{{ localfile.format }}
{% if localfile.format == 'command' or localfile.format == 'full_command' %}
@@ -502,10 +533,11 @@
{% endif %}
{% endfor %}
-{% endif %}
+{% endif -%}
{% if ansible_os_family == "RedHat" %}
{% for localfile in wazuh_manager_config.localfiles.centos %}
+
{{ localfile.format }}
{% if localfile.format == 'command' or localfile.format == 'full_command' %}
@@ -540,7 +572,7 @@
{% endif %}
{% endfor %}
-{% endif %}
+{% endif -%}
{% if wazuh_manager_config.syslog_outputs is defined %}
{% for syslog_output in wazuh_manager_config.syslog_outputs %}