From 3d8b941b4ce960cb1766c161fb1665df20b592d3 Mon Sep 17 00:00:00 2001
From: Daniel Berteaud <dbd@ehtrace.com>
Date: Wed, 16 Oct 2024 16:00:23 +0200
Subject: [PATCH] Update to 2024-10-16 16:00
---
roles/cni_plugins/defaults/main.yml | 4 ++--
roles/consul_bin/defaults/main.yml | 4 ++--
roles/metabase/defaults/main.yml | 6 +++---
roles/squid/tasks/main.yml | 8 +++++++-
4 files changed, 14 insertions(+), 8 deletions(-)
diff --git a/roles/cni_plugins/defaults/main.yml b/roles/cni_plugins/defaults/main.yml
index def4702..c236588 100644
--- a/roles/cni_plugins/defaults/main.yml
+++ b/roles/cni_plugins/defaults/main.yml
@@ -1,11 +1,11 @@
---
# Version of the CNI plugins to install
-cni_version: 1.5.1
+cni_version: 1.6.0
# Archive where the pre compiled bin archive will be downloaded
cni_archive_url: https://github.com/containernetworking/plugins/releases/download/v{{ cni_version }}/cni-plugins-linux-amd64-v{{ cni_version }}.tgz
# Expected checksum of the archive
-cni_archive_sha256: 77baa2f669980a82255ffa2f2717de823992480271ee778aa51a9c60ae89ff9b
+cni_archive_sha256: 682b49ff8933a997a52107161f1745f8312364b4c7f605ccdf7a77499130d89d
# Where the plugins will be installed (binaries will be extracted in a /bin sub-directory)
cni_root_dir: /opt/cni
diff --git a/roles/consul_bin/defaults/main.yml b/roles/consul_bin/defaults/main.yml
index 51dba3c..289a0f1 100644
--- a/roles/consul_bin/defaults/main.yml
+++ b/roles/consul_bin/defaults/main.yml
@@ -1,8 +1,8 @@
---
# Version of consul to deploy
-consul_version: 1.19.2
+consul_version: 1.20.0
# URL from where the consul archive will be downloaded
consul_archive_url: https://releases.hashicorp.com/consul/{{ consul_version }}/consul_{{ consul_version }}_linux_amd64.zip
# Expected sha256 of the archive
-consul_archive_sha256: 9315d95b19cf851f8fb0013b583ede6f61d591a9024a7dbb9b37eee45270abd2
+consul_archive_sha256: da7a71476f8a83f69853c95316518b888d5863ce3b326523bb8e3ad1a302ed64
diff --git a/roles/metabase/defaults/main.yml b/roles/metabase/defaults/main.yml
index 036e799..d31701f 100644
--- a/roles/metabase/defaults/main.yml
+++ b/roles/metabase/defaults/main.yml
@@ -1,15 +1,15 @@
---
# Version to deploy
-metabase_version: 0.50.28
+metabase_version: 0.50.30
# URL to fetch the jar
metabase_jar_url: https://downloads.metabase.com/v{{ metabase_version }}/metabase.jar
# Expected sha256 of the jar
-metabase_jar_sha256: a1d0dad4e3d64df6a19b4cbececf35b41869868cc3b7276bbacd531277ad1872
+metabase_jar_sha256: e7907cd15eb171654cfe0486ad0ddb87dec01628303ae310ff4cc77320c171f1
# When building from source
metabase_archive_url: https://github.com/metabase/metabase/archive/refs/tags/v{{ metabase_version }}.tar.gz
# Expected sha256 of the archive
-metabase_archive_sha256: 94310c3a35582b5d05cdbd0e1e998a70640c0e5a26b9f3725db237a7078d3aa8
+metabase_archive_sha256: e2907707c6c7036e7243436092ffa5e5524f41a4a1602a046af47b28905ad5a2
# Should ansible handle upgrades ? If set to false, only the initial install (and the config) will be handled
metabase_manage_upgrade: True
diff --git a/roles/squid/tasks/main.yml b/roles/squid/tasks/main.yml
index 4622e0a..2899b6f 100644
--- a/roles/squid/tasks/main.yml
+++ b/roles/squid/tasks/main.yml
@@ -9,11 +9,17 @@
tags: proxy
# Before 1.34.6-3 provided by EPEL, the service was handled by a init script and the service was named ufdb
+ # And before 1.35.8-2 it was udbGuard, now it's ufdbguard
- name: Check if the systemd unit is installed
stat: path=/lib/systemd/system/ufdbGuard.service
register: squid_ufdb_unit
tags: proxy
+- name: Check if the systemd unit is installed
+ stat: path=/lib/systemd/system/ufdbguard.service
+ register: squid_ufdbguard_unit
+ tags: proxy
+
- name: Identify intercept HTTP ports (if any)
set_fact: squid_intercept_http_ports={{ squid_http_ports | selectattr('port','defined') | selectattr('mode','defined') | selectattr('mode','equalto','intercept') | map(attribute='port') | list }}
tags: firewall,proxy
@@ -215,7 +221,7 @@
tags: proxy
- name: Handle ufdb daemon
- service: name={{ squid_ufdb_unit.stat.exists | ternary('ufdbGuard','ufdb') }} state={{ squid_filter_url | ternary('started','stopped') }} enabled={{ squid_filter_url | ternary(True,False) }}
+ service: name={{ squid_ufdb_unit.stat.exists | ternary('ufdbGuard', squid_ufdbguard_unit.stat.exists | ternary('ufdbguard', 'ufdb')) }} state={{ squid_filter_url | ternary('started','stopped') }} enabled={{ squid_filter_url | ternary(True,False) }}
tags: proxy
- include_tasks: filebeat.yml