From 5f238f4185fba9e7ce1802fd62aecf2762f9337e Mon Sep 17 00:00:00 2001
From: dfolcha <daniel.folch@wazuh.com>
Date: Thu, 26 Aug 2021 10:50:30 +0200
Subject: [PATCH] Update manager conf

---
 .../ansible-wazuh-manager/defaults/main.yml   | 29 +++++--------------
 .../var-ossec-etc-ossec-server.conf.j2        |  1 -
 2 files changed, 7 insertions(+), 23 deletions(-)

diff --git a/roles/wazuh/ansible-wazuh-manager/defaults/main.yml b/roles/wazuh/ansible-wazuh-manager/defaults/main.yml
index 261c8e50..b285f5eb 100644
--- a/roles/wazuh/ansible-wazuh-manager/defaults/main.yml
+++ b/roles/wazuh/ansible-wazuh-manager/defaults/main.yml
@@ -252,39 +252,24 @@ wazuh_manager_syscheck:
 ## Command
 wazuh_manager_commands:
   - name: 'disable-account'
-    executable: 'disable-account.sh'
-    expect: 'user'
+    executable: 'disable-account'
     timeout_allowed: 'yes'
-  - name: 'restart-ossec'
-    executable: 'restart-ossec.sh'
-    expect: ''
+  - name: 'restart-wazuh'
+    executable: 'restart-wazuh'
   - name: 'firewall-drop'
     executable: 'firewall-drop'
-    expect: 'srcip'
     timeout_allowed: 'yes'
   - name: 'host-deny'
-    executable: 'host-deny.sh'
-    expect: 'srcip'
+    executable: 'host-deny'
     timeout_allowed: 'yes'
   - name: 'route-null'
-    executable: 'route-null.sh'
-    expect: 'srcip'
+    executable: 'route-null'
     timeout_allowed: 'yes'
   - name: 'win_route-null'
-    executable: 'route-null.cmd'
-    expect: 'srcip'
-    timeout_allowed: 'yes'
-  - name: 'win_route-null-2012'
-    executable: 'route-null-2012.cmd'
-    expect: 'srcip'
+    executable: 'route-null.exe'
     timeout_allowed: 'yes'
   - name: 'netsh'
-    executable: 'netsh.cmd'
-    expect: 'srcip'
-    timeout_allowed: 'yes'
-  - name: 'netsh-win-2016'
-    executable: 'netsh-win-2016.cmd'
-    expect: 'srcip'
+    executable: 'netsh.exe'
     timeout_allowed: 'yes'
 
 ## Localfile
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 3242e88b..39050d09 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,6 @@
   <command>
     <name>{{ command.name }}</name>
     <executable>{{ command.executable }}</executable>
-    <expect>{{ command.expect }}</expect>
     {% if command.timeout_allowed is defined %}
         <timeout_allowed>{{ command.timeout_allowed }}</timeout_allowed>
     {% endif %}