From 4b8d89bddbc6b56bdc0ceef5ced8ebe2bb3e7105 Mon Sep 17 00:00:00 2001
From: Jeremy Lecour <jlecour@evolix.fr>
Date: Wed, 15 May 2024 13:26:37 +0200
Subject: [PATCH] evomaintenance: upstream release 24.05

---
 CHANGELOG                                    |  1 +
 roles/evomaintenance/files/evomaintenance.sh | 14 +++++++++++---
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index d747a5d..721bd2e 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -36,6 +36,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 * forwarding: added tags to distinguish IPv4 from IPv6
 * accounts: add a "users" tag so that new users are not created and customized password are not reset based on vars files when executing evolixisation.yml again
 * base: Generate default (self-signed) certificate
+* evomaintenance: upstream release 24.05
 
 ### Changed
 
diff --git a/roles/evomaintenance/files/evomaintenance.sh b/roles/evomaintenance/files/evomaintenance.sh
index 3ddbdf7..6846d3d 100644
--- a/roles/evomaintenance/files/evomaintenance.sh
+++ b/roles/evomaintenance/files/evomaintenance.sh
@@ -1,12 +1,12 @@
 #!/bin/sh
 
-VERSION="23.10.1"
+VERSION="24.05"
 
 show_version() {
     cat <<END
 evomaintenance version ${VERSION}
 
-Copyright 2007-2023 Evolix <info@evolix.fr>,
+Copyright 2007-2024 Evolix <info@evolix.fr>,
                     Gregory Colpart <reg@evolix.fr>,
                     Jérémy Lecour <jlecour@evolix.fr>,
                     Brice Waegeneire <bwaegeneire@evolix.fr>,
@@ -437,6 +437,14 @@ while :; do
             printf 'ERROR: "--message" requires a non-empty option argument.\n' >&2
             exit 1
             ;;
+        --no-evocheck)
+            # disable evocheck hook
+            EVOCHECK=0
+            ;;
+        --evocheck)
+            # enable evocheck hook
+            EVOCHECK=1
+            ;;
         --no-commit)
             # disable commit hook
             HOOK_COMMIT=0
@@ -581,7 +589,7 @@ GIT_REPOSITORIES="/etc /etc/bind /usr/share/scripts"
 
 # Add /etc directories from lxc containers if they are git directories
 if [ -d /var/lib/lxc ]; then
-    GIT_REPOSITORIES="${GIT_REPOSITORIES} $(find /var/lib/lxc/ -maxdepth 3 -name 'etc' | tr '\n' ' ' | sed 's/[[:space:]]\+$//')"
+    GIT_REPOSITORIES="${GIT_REPOSITORIES} $(find -L /var/lib/lxc/ -maxdepth 3 -name 'etc' | tr '\n' ' ' | sed 's/[[:space:]]\+$//')"
 fi
 
 # initialize variable