From 6600568661703f04c4f97e8e29310ccfb011885e Mon Sep 17 00:00:00 2001
From: Daniel Berteaud <daniel@firewall-services.com>
Date: Mon, 28 Jun 2021 17:00:06 +0200
Subject: [PATCH] Update to 2021-06-28 17:00

---
 roles/graylog/defaults/main.yml        |  7 ++-----
 roles/graylog/tasks/install.yml        | 15 ---------------
 roles/matrix_element/defaults/main.yml |  4 ++--
 roles/pgadmin4/defaults/main.yml       |  2 +-
 4 files changed, 5 insertions(+), 23 deletions(-)

diff --git a/roles/graylog/defaults/main.yml b/roles/graylog/defaults/main.yml
index efc5212..7eeb39a 100644
--- a/roles/graylog/defaults/main.yml
+++ b/roles/graylog/defaults/main.yml
@@ -1,16 +1,13 @@
 ---
 
-graylog_version: 4.0.8
+graylog_version: 4.1.0
 graylog_archive_url: https://downloads.graylog.org/releases/graylog/graylog-{{ graylog_version }}.tgz
-graylog_archive_sha1: 9d14cccf2291c8b2dd8747e85a19048a3cdbffbe
+graylog_archive_sha1: f33a9d915f5aec9a4a86286754db698b39b85dda
 graylog_root_dir: /opt/graylog
 graylog_manage_upgrade: True
 
 graylog_is_master: True
 
-# Additional libs to download
-graylog_libs: {}
-
 graylog_plugins:
   graylog-output-syslog:
     version: 3.3.0
diff --git a/roles/graylog/tasks/install.yml b/roles/graylog/tasks/install.yml
index e90eb51..80178c1 100644
--- a/roles/graylog/tasks/install.yml
+++ b/roles/graylog/tasks/install.yml
@@ -41,21 +41,6 @@
   notify: restart graylog-server
   tags: graylog
 
-- name: Install external libs
-  get_url:
-    url: "{{ graylog_libs[item].url }}"
-    dest: /opt/graylog/app/lib
-    checksum: sha1:{{ graylog_libs[item].sha1 }}
-  loop: "{{ graylog_libs.keys() | list }}"
-  notify: restart graylog-server
-  tags: graylog
-
-- name: Find existing libs
-  shell: find {{ graylog_root_dir }}/app/lib -type f -name \*.jar
-  register: graylog_libs_installed
-  changed_when: False
-  tags: graylog
-
 - name: Install plugins
   get_url:
     url: "{{ graylog_plugins[item].url }}"
diff --git a/roles/matrix_element/defaults/main.yml b/roles/matrix_element/defaults/main.yml
index 1a8111b..d9ee25d 100644
--- a/roles/matrix_element/defaults/main.yml
+++ b/roles/matrix_element/defaults/main.yml
@@ -5,9 +5,9 @@
 element_id: element
 
 # Version to deploy, and expected sha1
-element_version: 1.7.30
+element_version: 1.7.31
 # sha1sum of the tar.gz
-element_archive_sha1: 35efe33472079d63d443002b2a85bd08e3fa4e4c
+element_archive_sha1: faf1a5528497a3ec7e382f342a06eacc0748392f
 
 # Where to install element
 element_root_dir: /opt/matrix/element
diff --git a/roles/pgadmin4/defaults/main.yml b/roles/pgadmin4/defaults/main.yml
index 39e0590..a1710d9 100644
--- a/roles/pgadmin4/defaults/main.yml
+++ b/roles/pgadmin4/defaults/main.yml
@@ -4,6 +4,6 @@ pga_id: 1
 pga_port: 5050
 pga_src_ip: []
 pga_root_dir: /opt/pgadmin4_{{ pga_id }}
-pga_version: '5.3'
+pga_version: '5.4'
 pga_pip_url: https://ftp.postgresql.org/pub/pgadmin/pgadmin4/v{{ pga_version }}/pip/pgadmin4-{{ pga_version }}-py3-none-any.whl
 pga_master_pass: False