Merge pull request #304 from Gati0/master

Move up task 'Override architecture if 64-bit'
dj-wasabi · Feb 4, 2020 · 14eedac · 14eedac
2 parents 1330434 + 53612d6
commit 14eedac
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/defaults/main.yml b/defaults/main.yml
@@ -129,7 +129,7 @@ zabbix_agent_tls_config:
 zabbix_version_long: 4.4.4
 
 # Windows Related
-zabbix_win_package: zabbix_agents_{{ zabbix_version_long }}.win.zip
+zabbix_win_package: zabbix_agent-{{ zabbix_version_long }}-windows-i386.zip
 zabbix_win_download_url: https://www.zabbix.com/downloads
 zabbix_win_download_link: "{{ zabbix_win_download_url }}/{{ zabbix_version_long }}/{{ zabbix_win_package }}"
 zabbix_win_install_dir: 'C:\Zabbix'

diff --git a/tasks/Windows.yml b/tasks/Windows.yml
@@ -11,6 +11,12 @@
   set_fact:
     windows_arch: 32
 
+- name: "Windows | Override architecture if 64-bit"
+  set_fact:
+    windows_arch: 64
+  when:
+    - ansible_architecture == "64-bit"
+
 - name: "Windows | Set path to zabbix.exe"
   set_fact:
     zabbix_win_exe_path: '{{ zabbix_win_install_dir }}\bin\win{{ windows_arch }}\zabbix_agentd.exe'
@@ -22,12 +28,6 @@
   when:
     - zabbix_version_long is version('4.0.0', '>=')
 
-- name: "Windows | Override architecture if 64-bit"
-  set_fact:
-    windows_arch: 64
-  when:
-    - ansible_architecture == "64-bit"
-
 - name: "Windows | Check if Zabbix agent is present"
   win_stat:
     path: '{{ zabbix_win_exe_path }}'