From f6b05e25da7b9a626e09506a64ac9366b6461d5b Mon Sep 17 00:00:00 2001
From: Nicolas Lastra <lastra.nikos@gmail.com>
Date: Thu, 18 Nov 2021 18:27:04 -0300
Subject: [PATCH] fix var-ossec-etc-ossec-server.conf.j2, authd module and sub
 module force

---
 .../templates/var-ossec-etc-ossec-server.conf.j2   | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

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 0c4eee1b..c5c1a788 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
@@ -369,7 +369,9 @@
   <command>
     <name>{{ command.name }}</name>
     <executable>{{ command.executable }}</executable>
-    <expect>{{ command.expect }}</expect>
+    {% if command.expect is defined %}
+        <expect>{{ command.expect }}</expect>
+    {% endif %}
     {% if command.timeout_allowed is defined %}
         <timeout_allowed>{{ command.timeout_allowed }}</timeout_allowed>
     {% endif %}
@@ -625,22 +627,22 @@
     {% endif %}
     <force>
       {% if wazuh_manager_config.authd.force.enabled is not none %}
-      <enabled>{{wazuh_manager_config.authd.port}}</enabled>
+      <enabled>{{wazuh_manager_config.authd.force.enabled}}</enabled>
       {% else %}
       <enabledport>yes</enabled>
       {% endif %}
       {% if wazuh_manager_config.authd.force.key_mismatch is not none %}
-      <key_mismatch>{{wazuh_manager_config.authd.port}}</key_mismatch>
+      <key_mismatch>{{wazuh_manager_config.authd.force.key_mismatch}}</key_mismatch>
       {% else %}
       <key_mismatch>yes</key_mismatch>
       {% endif %}
       {% if wazuh_manager_config.authd.force.disconnected_time is not none %}
-      <disconnected_time>{{wazuh_manager_config.authd.port}}</disconnected_time>
+      <disconnected_time enabled="yes">{{wazuh_manager_config.authd.force.disconnected_time}}</disconnected_time>
       {% else %}
-      <disconnected_time>1h</disconnected_time>
+      <disconnected_time enabled="yes">1h</disconnected_time>
       {% endif %}
       {% if wazuh_manager_config.authd.force.after_registration_time is not none %}
-      <after_registration_time>{{wazuh_manager_config.authd.port}}</after_registration_time>
+      <after_registration_time>{{wazuh_manager_config.authd.force.after_registration_time}}</after_registration_time>
       {% else %}
       <after_registration_time>1h</after_registration_time>
       {% endif %}