From 9e300e1ff2b392458a07b8fb7b36f19a7b87cb6f Mon Sep 17 00:00:00 2001 From: Daniel Berteaud Date: Wed, 19 Feb 2025 14:00:57 +0100 Subject: [PATCH] Update to 2025-02-19 14:00 --- roles/consul_bin/defaults/main.yml | 4 ++-- roles/consul_template/defaults/main.yml | 4 ++-- roles/gitea/defaults/main.yml | 4 ++-- roles/seadrive/templates/seadrive.service.j2 | 2 +- roles/squid/files/acl/software_various.domains | 1 + 5 files changed, 8 insertions(+), 7 deletions(-) diff --git a/roles/consul_bin/defaults/main.yml b/roles/consul_bin/defaults/main.yml index 2e2ae2d..17bb7da 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.20.2 +consul_version: 1.20.3 # 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: 1bf7ddf332f02e6e36082b0fdf6c3e8ce12a391e7ec7dafd3237bb12766a7fd5 +consul_archive_sha256: 23f55df756d6fd9dbf11973738468183599b66e737bf50cd7d1f29ed92a79776 diff --git a/roles/consul_template/defaults/main.yml b/roles/consul_template/defaults/main.yml index ae34c6a..ee180a1 100644 --- a/roles/consul_template/defaults/main.yml +++ b/roles/consul_template/defaults/main.yml @@ -1,11 +1,11 @@ --- # Version of consul-template to install -consul_tpl_version: 0.39.1 +consul_tpl_version: 0.40.0 # URL of the archive consul_tpl_archive_url: https://releases.hashicorp.com/consul-template/{{ consul_tpl_version }}/consul-template_{{ consul_tpl_version }}_linux_amd64.zip # Expected sha256 of the archive -consul_tpl_archive_sha256: b77c7550defda78c62b036c734e7faceb7f89519dc12406db84f2c3af06bc5fb +consul_tpl_archive_sha256: f73cb36988b9aaccb0ac918df26c854ccd199e60c0df011357405672f3d934bc # Root dir where consul-template will be installed consul_tpl_root_dir: /opt/consul_template diff --git a/roles/gitea/defaults/main.yml b/roles/gitea/defaults/main.yml index 64e2534..fdd0f24 100644 --- a/roles/gitea/defaults/main.yml +++ b/roles/gitea/defaults/main.yml @@ -1,11 +1,11 @@ --- # Version to install -gitea_version: '1.23.1' +gitea_version: '1.23.4' # URL to the binary gitea_bin_url: https://dl.gitea.io/gitea/{{ gitea_version }}/gitea-{{ gitea_version }}-linux-amd64 # sha256 of the binary -gitea_bin_sha256: a7e27789a3705c06913649d84d279b076026036aa6724eb133644533050d7149 +gitea_bin_sha256: 51c25be0bfc3dab25f7e16e736d0a8e15b8c6c571e69139ee487993956caf8bf # Handle updates. If set to false, ansible will only install # Gitea and then won't touch an existing installation gitea_manage_upgrade: True diff --git a/roles/seadrive/templates/seadrive.service.j2 b/roles/seadrive/templates/seadrive.service.j2 index f370713..b32bf9e 100644 --- a/roles/seadrive/templates/seadrive.service.j2 +++ b/roles/seadrive/templates/seadrive.service.j2 @@ -4,7 +4,7 @@ Description=Seafile virtual drive [Service] Type=simple ExecStart=/usr/bin/seadrive -c /etc/seadrive/{{ item.id }}.conf -d {{ item.data_dir | default('/var/cache/seadrive/' + item.id) }} -o {{ item.fuse_opts | default(['allow_other']) | join(',') }} -f -l - {{ item.drive_dir }} -ExecStopPost=/bin/fusermount -uz {{ item.drive_dir }} +ExecStopPost=!/bin/fusermount -uz {{ item.drive_dir }} RestartSec=5 User={{ item.user | default('root') }} MemoryLimit=1024M diff --git a/roles/squid/files/acl/software_various.domains b/roles/squid/files/acl/software_various.domains index 95a6d6f..3b82739 100644 --- a/roles/squid/files/acl/software_various.domains +++ b/roles/squid/files/acl/software_various.domains @@ -294,6 +294,7 @@ pkg-containers.githubusercontent.com registry.k8s.io europe-west9-docker.pkg.dev prod-registry-k8s-io-eu-west-1.s3.dualstack.eu-west-1.amazonaws.com +docker-images-prod.6aa30f8b08e16409b46e0173d6de2f56.r2.cloudflarestorage.com # Artifactory (jfrog) docker.bintray.io