From 3d88ece7a910d160dc22fff18c2cc0e734ac3136 Mon Sep 17 00:00:00 2001
From: Daniel Berteaud <dbd@ehtrace.com>
Date: Mon, 7 Feb 2022 10:00:15 +0100
Subject: [PATCH] Update to 2022-02-07 10:00

---
 roles/common/meta/main.yml           | 1 +
 roles/sftpgo/defaults/main.yml       | 4 ++--
 roles/zabbix_agent/defaults/main.yml | 7 +++----
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/roles/common/meta/main.yml b/roles/common/meta/main.yml
index 4876c06..7ebb06d 100644
--- a/roles/common/meta/main.yml
+++ b/roles/common/meta/main.yml
@@ -9,6 +9,7 @@ dependencies:
   - role: iptables
     when: iptables_manage | default(True)
   - role: zabbix_agent
+    when: zabbix_agent_servers | length > 0 or zabbix_agent_servers_active | length > 0
   - role: fusioninventory_agent
     when: fusinv_uri is defined and fusinv_uri | length > 0
   - role: sssd_ldap_auth
diff --git a/roles/sftpgo/defaults/main.yml b/roles/sftpgo/defaults/main.yml
index 04ebd5f..0d4709a 100644
--- a/roles/sftpgo/defaults/main.yml
+++ b/roles/sftpgo/defaults/main.yml
@@ -1,11 +1,11 @@
 ---
 
 # Version to deploy
-sftpgo_version: 2.2.1
+sftpgo_version: 2.2.2
 # URL of the archive
 sftpgo_archive_url: https://github.com/drakkan/sftpgo/releases/download/v{{ sftpgo_version }}/sftpgo_v{{ sftpgo_version }}_linux_x86_64.tar.xz
 # Expected sha1 of the archive
-sftpgo_archive_sha1: 4c19aea45aacc538044f96952e9c45bc3888a750
+sftpgo_archive_sha1: 23c89d4165c0800aa6a3077f7a3dbcf63b3709a2
 
 # Should ansible handle upgrades ? If False, only initial install will be done
 sftpgo_manage_upgrade: True
diff --git a/roles/zabbix_agent/defaults/main.yml b/roles/zabbix_agent/defaults/main.yml
index d0b2a63..5c2fc95 100644
--- a/roles/zabbix_agent/defaults/main.yml
+++ b/roles/zabbix_agent/defaults/main.yml
@@ -4,12 +4,11 @@ zabbix_agent_port: 10050
 zabbix_agent2: False
 
 # List of servers allowed to connect to the agent (passive checks)
-zabbix_agent_servers:
-  - 51.91.175.34
+zabbix_agent_servers: []
 # List of IP allowed to access TCP port 10050
 zabbix_agent_src_ip: "{{ zabbix_agent_servers }}"
 # List of servers the agent will push active checks to
-zabbix_agent_server_active: []
+zabbix_agent_servers_active: []
 
 zabbix_agent_base_conf:
   PidFile: /var/run/zabbix/zabbix_agentd.pid
@@ -17,7 +16,7 @@ zabbix_agent_base_conf:
   LogType: system
   Server: "{{ zabbix_agent_servers | join(',') }}"
   ListenPort: "{{ zabbix_agent_port }}"
-  ServerActive: "{{ zabbix_agent_server_active | join(',') }}"
+  ServerActive: "{{ zabbix_agent_servers_active | join(',') }}"
   HostnameItem: 'system.hostname'
   Timeout: 29 # just a bit less than the proxies' Timeout
   Include: '/etc/zabbix/zabbix_agentd.conf.d/*.conf'