From 2a7241b31a87da9289933e0358690dba64f15b6c Mon Sep 17 00:00:00 2001
From: Jose M <jm.garcia@wazuh.com>
Date: Thu, 20 Feb 2020 12:39:26 +0100
Subject: [PATCH 1/3] Adapt Windows Agent package related variables

---
 roles/wazuh/ansible-wazuh-agent/defaults/main.yml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/roles/wazuh/ansible-wazuh-agent/defaults/main.yml b/roles/wazuh/ansible-wazuh-agent/defaults/main.yml
index ccd96e1c..a5e0a8c0 100644
--- a/roles/wazuh/ansible-wazuh-agent/defaults/main.yml
+++ b/roles/wazuh/ansible-wazuh-agent/defaults/main.yml
@@ -60,10 +60,9 @@ wazuh_winagent_config:
   auth_path: C:\Program Files\ossec-agent\agent-auth.exe
   # Adding quotes to auth_path_x86 since win_shell outputs error otherwise
   auth_path_x86: C:\'Program Files (x86)'\ossec-agent\agent-auth.exe
-  version: '3.11.3'
-  revision: '1'
-  repo: https://packages.wazuh.com/3.x/windows/
   md5: e4623e7cd3f2fc6ac8a313cbdd7c3cba
+wazuh_winagent_config_url: https://packages.wazuh.com/3.x/windows/wazuh-agent-3.11.3-1.msi
+wazuh_winagent_package_name: wazuh-agent-3.11.3-1.msi
 wazuh_agent_config:
   repo:
     apt: 'deb https://packages.wazuh.com/3.x/apt/ stable main'

From c32b1ed1bd667addd29785aaa3029e79d025f996 Mon Sep 17 00:00:00 2001
From: Jose M <jm.garcia@wazuh.com>
Date: Thu, 20 Feb 2020 12:39:45 +0100
Subject: [PATCH 2/3] Change Window spackage occurences to adapt it to the new
 variables

---
 roles/wazuh/ansible-wazuh-agent/tasks/Windows.yml | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/roles/wazuh/ansible-wazuh-agent/tasks/Windows.yml b/roles/wazuh/ansible-wazuh-agent/tasks/Windows.yml
index 61e2412d..11f15255 100644
--- a/roles/wazuh/ansible-wazuh-agent/tasks/Windows.yml
+++ b/roles/wazuh/ansible-wazuh-agent/tasks/Windows.yml
@@ -20,19 +20,19 @@
 
 - name: Windows | Check if Wazuh installer is already downloaded
   win_stat:
-    path: "{{ wazuh_winagent_config.download_dir }}wazuh-agent-{{ wazuh_winagent_config.version }}-{{ wazuh_winagent_config.revision }}.msi"
+    path: "{{ wazuh_winagent_config.download_dir }}{{ wazuh_winagent_package_name }}"
   register: wazuh_package_downloaded
 
 - name: Windows | Download Wazuh Agent package
   win_get_url:
-    url: "{{ wazuh_winagent_config.repo }}wazuh-agent-{{ wazuh_winagent_config.version }}-{{ wazuh_winagent_config.revision }}.msi"
+    url: "{{ wazuh_winagent_config_url }}"
     dest: "{{ wazuh_winagent_config.download_dir }}"
   when:
     - not wazuh_package_downloaded.stat.exists
 
 - name: Windows | Verify the Wazuh Agent installer
   win_stat:
-    path: "{{ wazuh_winagent_config.download_dir }}wazuh-agent-{{ wazuh_winagent_config.version }}-{{ wazuh_winagent_config.revision }}.msi"
+    path: "{{ wazuh_winagent_config.download_dir }}{{ wazuh_winagent_package_name }}"
     get_checksum: true
     checksum_algorithm: md5
   register: wazuh_agent_status
@@ -41,11 +41,12 @@
 
 - name: Windows | Install Agent if not already installed
   win_package:
-    path: "{{ wazuh_winagent_config.download_dir }}wazuh-agent-{{ wazuh_winagent_config.version }}-{{ wazuh_winagent_config.revision }}.msi"
+    path: "{{ wazuh_winagent_config.download_dir }}{{ wazuh_winagent_package_name }}"
     state: present
 
 - name: Windows | Check if client.keys exists
-  win_stat: path="{{ wazuh_agent_win_path }}client.keys"
+  win_stat: 
+    path: "{{ wazuh_agent_win_path }}client.keys"
   register: check_windows_key
   tags:
     - config
@@ -94,5 +95,5 @@
 
 - name: Windows | Delete downloaded Wazuh agent installer file
   win_file:
-    path: "{{ wazuh_winagent_config.download_dir }}wazuh-agent-{{ wazuh_winagent_config.version }}-{{ wazuh_winagent_config.revision }}.msi"
+    path: "{{ wazuh_winagent_config.download_dir }}{{ wazuh_winagent_package_name }}"
     state: absent

From 4f8d3c6c0c17d40488b1551f452c62319a6cb0ff Mon Sep 17 00:00:00 2001
From: Jose M <jm.garcia@wazuh.com>
Date: Thu, 20 Feb 2020 12:46:41 +0100
Subject: [PATCH 3/3] Remove traling whitespace in win_package task

---
 roles/wazuh/ansible-wazuh-agent/tasks/Windows.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/roles/wazuh/ansible-wazuh-agent/tasks/Windows.yml b/roles/wazuh/ansible-wazuh-agent/tasks/Windows.yml
index 11f15255..dc9b8fe0 100644
--- a/roles/wazuh/ansible-wazuh-agent/tasks/Windows.yml
+++ b/roles/wazuh/ansible-wazuh-agent/tasks/Windows.yml
@@ -45,7 +45,7 @@
     state: present
 
 - name: Windows | Check if client.keys exists
-  win_stat: 
+  win_stat:
     path: "{{ wazuh_agent_win_path }}client.keys"
   register: check_windows_key
   tags: