From afd2cfc5e4406636bc4ab0988720b3d145bfbae8 Mon Sep 17 00:00:00 2001
From: Daniel Berteaud <daniel@firewall-services.com>
Date: Tue, 13 Jul 2021 19:00:06 +0200
Subject: [PATCH] Update to 2021-07-13 19:00

---
 roles/common/vars/Debian-11.yml                    | 10 ++++
 .../fusioninventory_agent/tasks/install_Debian.yml | 60 +++++++++++++---------
 roles/letsencrypt/vars/Debian-11.yml               |  6 +++
 roles/ntp_client/vars/Debian-11.yml                |  6 +++
 roles/repo_zabbix/tasks/Debian.yml                 |  3 +-
 roles/rsync_server/vars/Debian-11.yml              |  4 ++
 roles/zabbix_agent/vars/Debian-11.yml              | 14 +++++
 7 files changed, 77 insertions(+), 26 deletions(-)
 create mode 100644 roles/common/vars/Debian-11.yml
 create mode 100644 roles/letsencrypt/vars/Debian-11.yml
 create mode 100644 roles/ntp_client/vars/Debian-11.yml
 create mode 100644 roles/rsync_server/vars/Debian-11.yml
 create mode 100644 roles/zabbix_agent/vars/Debian-11.yml

diff --git a/roles/common/vars/Debian-11.yml b/roles/common/vars/Debian-11.yml
new file mode 100644
index 0000000..11709c8
--- /dev/null
+++ b/roles/common/vars/Debian-11.yml
@@ -0,0 +1,10 @@
+---
+
+system_distro_utils:
+  - apt-transport-https
+  - openssh-client
+  - netcat
+  - xz-utils
+  - liblz4-tool
+  - sshfs
+  - zstd
diff --git a/roles/fusioninventory_agent/tasks/install_Debian.yml b/roles/fusioninventory_agent/tasks/install_Debian.yml
index 0925400..7e6452c 100644
--- a/roles/fusioninventory_agent/tasks/install_Debian.yml
+++ b/roles/fusioninventory_agent/tasks/install_Debian.yml
@@ -1,28 +1,38 @@
 ---
 
-- name: Install dependencies
-  apt:
-    name:
-      - dmidecode
-      - hwdata
-      - ucf
-      - hdparm
-      - perl
-      - libuniversal-require-perl
-      - libwww-perl
-      - libparse-edid-perl
-      - libproc-daemon-perl
-      - libproc-pid-file-perl
-      - libfile-which-perl
-      - libxml-treepp-perl
-      - libyaml-perl
-      - libnet-cups-perl
-      - libnet-ip-perl
-      - libdigest-sha-perl
-      - libsocket-getaddrinfo-perl
-      - libtext-template-perl
+- when: ansible_distribution_major_version is version('11', '<')
+  block:
+    - name: Install dependencies
+      apt:
+        name:
+          - dmidecode
+          - hwdata
+          - ucf
+          - hdparm
+          - perl
+          - libuniversal-require-perl
+          - libwww-perl
+          - libparse-edid-perl
+          - libproc-daemon-perl
+          - libproc-pid-file-perl
+          - libfile-which-perl
+          - libxml-treepp-perl
+          - libyaml-perl
+          - libnet-cups-perl
+          - libnet-ip-perl
+          - libdigest-sha-perl
+          - libsocket-getaddrinfo-perl
+          - libtext-template-perl
+    
+    - name: Install fusioninventory
+      apt: deb=http://ftp.fr.debian.org/debian/pool/main/f/fusioninventory-agent/fusioninventory-agent_{{ fusinv_deb_version }}_all.deb
+      environment:
+        - http_proxy: "{{ system_proxy | default('') }}"
+
+- when: ansible_distribution_major_version is version('11', '>=')
+  block:
+    - name: Install FusionInventory Agent
+      apt:
+        name:
+          - fusioninventory-agent
 
-- name: Install fusioninventory
-  apt: deb=http://ftp.fr.debian.org/debian/pool/main/f/fusioninventory-agent/fusioninventory-agent_{{ fusinv_deb_version }}_all.deb
-  environment:
-    - http_proxy: "{{ system_proxy | default('') }}"
diff --git a/roles/letsencrypt/vars/Debian-11.yml b/roles/letsencrypt/vars/Debian-11.yml
new file mode 100644
index 0000000..17d3cc8
--- /dev/null
+++ b/roles/letsencrypt/vars/Debian-11.yml
@@ -0,0 +1,6 @@
+---
+
+letsencrypt_packages:
+  - python3-pip
+  - python3-setuptools
+  - curl
diff --git a/roles/ntp_client/vars/Debian-11.yml b/roles/ntp_client/vars/Debian-11.yml
new file mode 100644
index 0000000..1f3c307
--- /dev/null
+++ b/roles/ntp_client/vars/Debian-11.yml
@@ -0,0 +1,6 @@
+---
+
+ntp_ntpd_service: ntp
+ntp_chrony_service: chrony
+ntp_chrony_conf: /etc/chrony/chrony.conf
+ntp_chrony_keyfile: /etc/chrony/chrony.keys
diff --git a/roles/repo_zabbix/tasks/Debian.yml b/roles/repo_zabbix/tasks/Debian.yml
index 224d86d..b101992 100644
--- a/roles/repo_zabbix/tasks/Debian.yml
+++ b/roles/repo_zabbix/tasks/Debian.yml
@@ -8,6 +8,7 @@
 
 - name: Add Zabbix repo
   apt_repository:
-    repo: deb http://repo.zabbix.com/zabbix/{{ zabbix_major_version }}/debian {{ ansible_distribution_release }} main
+    # Waiting for Zabbix repo to support bullseye, point it to buster
+    repo: deb http://repo.zabbix.com/zabbix/{{ zabbix_major_version }}/debian {{ (ansible_distribution_release == 'bullseye') | ternary('buster',ansible_distribution_release) }} main
     filename: zabbix
   tags: repo
diff --git a/roles/rsync_server/vars/Debian-11.yml b/roles/rsync_server/vars/Debian-11.yml
new file mode 100644
index 0000000..71f7cce
--- /dev/null
+++ b/roles/rsync_server/vars/Debian-11.yml
@@ -0,0 +1,4 @@
+---
+
+rsync_packages:
+  - rsync
diff --git a/roles/zabbix_agent/vars/Debian-11.yml b/roles/zabbix_agent/vars/Debian-11.yml
new file mode 100644
index 0000000..b09c3a4
--- /dev/null
+++ b/roles/zabbix_agent/vars/Debian-11.yml
@@ -0,0 +1,14 @@
+---
+
+zabbix_agent_packages:
+  - zabbix-agent
+  - openssl
+  - git
+  - libconfig-simple-perl
+  - libjson-perl
+  - libfile-which-perl
+  - smartmontools
+  - lm-sensors
+  - patch
+  - fping
+  - libstatistics-descriptive-perl