From 81da0fe8f1f4b5ea79bbcbdfd645e34c26f3ff7a Mon Sep 17 00:00:00 2001
From: Daniel Berteaud <dbd@ehtrace.com>
Date: Wed, 2 Feb 2022 23:00:07 +0100
Subject: [PATCH] Update to 2022-02-02 23:00

---
 roles/bookstack/defaults/main.yml              | 4 ++--
 roles/diagrams/defaults/main.yml               | 4 ++--
 roles/framadate/defaults/main.yml              | 4 ++--
 roles/framadate/tasks/main.yml                 | 1 +
 roles/includes/webapps_archive.yml             | 3 +++
 roles/letsencrypt/tasks/main.yml               | 7 ++++++-
 roles/squid/files/acl/software_various.domains | 3 +++
 7 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/roles/bookstack/defaults/main.yml b/roles/bookstack/defaults/main.yml
index e84836e..9e3df52 100644
--- a/roles/bookstack/defaults/main.yml
+++ b/roles/bookstack/defaults/main.yml
@@ -1,11 +1,11 @@
 ---
 
 # Version to deploy
-bookstack_version: '21.12.2'
+bookstack_version: '21.12.4'
 # URL of the arhive
 bookstack_archive_url: https://github.com/BookStackApp/BookStack/archive/v{{ bookstack_version }}.tar.gz
 # Expected sha1 of the archive
-bookstack_archive_sha1: cc4498f2fba7094172c46eced77d6e9ec28410e1
+bookstack_archive_sha1: 41bd7ee0551f527ccd9fd9088c21c1f05118821d
 
 # Should ansible handle bookstack upgrades or just the inintial install
 bookstack_manage_upgrade: True
diff --git a/roles/diagrams/defaults/main.yml b/roles/diagrams/defaults/main.yml
index 22a6fdc..233610b 100644
--- a/roles/diagrams/defaults/main.yml
+++ b/roles/diagrams/defaults/main.yml
@@ -1,11 +1,11 @@
 ---
 
 # Veresion of diagrams to deploy
-diagrams_version: 16.2.4
+diagrams_version: 16.5.3
 # URL of the WAR file to deploy
 diagrams_war_url: https://github.com/jgraph/drawio/releases/download/v{{ diagrams_version }}/draw.war
 # Expected sha1 of the WAR file
-diagrams_war_sha1: 36eb6e07a3eacffc53cdb71a780087380e74bf3c
+diagrams_war_sha1: 0891c13282addb9a40cdbe5745d195eeb01cc708
 # root directory of the installation
 diagrams_root_dir: /opt/diagrams
 # Should ansible manage upgrades, or just initial install ?
diff --git a/roles/framadate/defaults/main.yml b/roles/framadate/defaults/main.yml
index 873a0ec..e787ef2 100644
--- a/roles/framadate/defaults/main.yml
+++ b/roles/framadate/defaults/main.yml
@@ -7,7 +7,7 @@ framadate_id: 1
 framadate_root_dir: /opt/framadate_{{ framadate_id }}
 
 # The version to deploy
-framadate_version: '1.1.17'
+framadate_version: '1.1.19'
 
 # Should ansible manage upgrades, or only initial installation
 framadate_manage_upgrade: True
@@ -16,7 +16,7 @@ framadate_manage_upgrade: True
 framadate_zip_url: https://framagit.org/framasoft/framadate/framadate/-/archive/{{ framadate_version }}/framadate-{{ framadate_version }}.zip
 
 # The sha1 checksum of the archive
-framadate_zip_sha1: 5c0782f1db6a797df70047c3715003178956ca3d
+framadate_zip_sha1: c501c8a7d2cab0ff45ad865c689ba4139585ee11
 
 # The user account under which PHP is executed
 framadate_php_user: php-framadate_{{ framadate_id }}
diff --git a/roles/framadate/tasks/main.yml b/roles/framadate/tasks/main.yml
index 75242e1..990d63a 100644
--- a/roles/framadate/tasks/main.yml
+++ b/roles/framadate/tasks/main.yml
@@ -10,6 +10,7 @@
       - unzip
       - acl
       - tar
+      - git
   tags: framadate
 
 - name: Create user account for PHP
diff --git a/roles/includes/webapps_archive.yml b/roles/includes/webapps_archive.yml
index 5ff3f31..515e9be 100644
--- a/roles/includes/webapps_archive.yml
+++ b/roles/includes/webapps_archive.yml
@@ -1,5 +1,8 @@
 ---
 
+- name: Install mysqldump
+  package: name=mariadb
+
 - name: Create archive dir
   file: path={{ root_dir }}/archives/{{ version }} state=directory mode=700
 
diff --git a/roles/letsencrypt/tasks/main.yml b/roles/letsencrypt/tasks/main.yml
index 21e74e8..c600360 100644
--- a/roles/letsencrypt/tasks/main.yml
+++ b/roles/letsencrypt/tasks/main.yml
@@ -46,7 +46,12 @@
   pip: name=dns-lexicon state=latest
   environment:
     - https_proxy: "{{ system_proxy | default('') }}"
-  when: ansible_os_family == 'Debian'
+  when: ansible_os_family == 'Debian' and ansible_distribution_major_version is version('11', '<')
+  tags: web,ssl
+
+- name: Install lexicon
+  package: name=lexicon state=latest
+  when: ansible_os_family == 'Debian' and ansible_distribution_major_version is version('11', '>=')
   tags: web,ssl
 
 - name: Create hook directories
diff --git a/roles/squid/files/acl/software_various.domains b/roles/squid/files/acl/software_various.domains
index e491f9e..b3ee30b 100644
--- a/roles/squid/files/acl/software_various.domains
+++ b/roles/squid/files/acl/software_various.domains
@@ -368,3 +368,6 @@ packages.groonga.org
 # Clojure
 download.clojure.org
 repo.clojars.org
+
+# LUX RPM repo
+repo.iotti.biz