From 037ec9d3765f3648b564fc3c973c8a4c5ec3db78 Mon Sep 17 00:00:00 2001
From: Jeremy Lecour <jlecour@evolix.fr>
Date: Fri, 1 Mar 2024 08:26:43 +0100
Subject: [PATCH] autosysadmin-agent: upstream release 24.03

---
 CHANGELOG.md                                  |  2 +-
 .../files/upstream/lib/common.sh              | 37 ++++++++++++-------
 .../files/upstream/repair/repair_amavis       | 16 --------
 .../files/upstream/restart/README             |  2 +-
 4 files changed, 25 insertions(+), 32 deletions(-)
 delete mode 100755 autosysadmin-agent/files/upstream/repair/repair_amavis

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 46cbeaa6..09e75075 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,7 +13,7 @@ The **patch** part changes is incremented if multiple releases happen the same m
 
 ### Added
 
-* autosysadmin-agent: upstream release 24.02.3
+* autosysadmin-agent: upstream release 24.03
 * certbot: Renewal hook for NRPE
 * kvm-host: add minifirewall rules if DRBD interface is configured
 
diff --git a/autosysadmin-agent/files/upstream/lib/common.sh b/autosysadmin-agent/files/upstream/lib/common.sh
index f3c16359..cc3c53e6 100755
--- a/autosysadmin-agent/files/upstream/lib/common.sh
+++ b/autosysadmin-agent/files/upstream/lib/common.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-VERSION="24.02.3"
+VERSION="24.03"
 
 # Common functions for "repair" and "restart" scripts
 
@@ -37,22 +37,31 @@ initialize() {
     RUN_ID="$(date +"%Y-%m-%d_%H-%M")_${PROGNAME}_${PID}"
     readonly RUN_ID
 
+    # Main log directory
+    MAIN_LOG_DIR="/var/log/autosysadmin"
+    readonly MAIN_LOG_DIR
+    # shellcheck disable=SC2174
+    mkdir --mode=750 --parents "${MAIN_LOG_DIR}"
+    chgrp adm "${MAIN_LOG_DIR}"
+
     # Each execution store some information
     # in a unique directory based on the RUN_ID
-    LOG_DIR="/var/log/autosysadmin/${RUN_ID}"
-    readonly LOG_DIR
-    mkdir -p "${LOG_DIR}"
+    RUN_LOG_DIR="${MAIN_LOG_DIR}/${RUN_ID}"
+    readonly RUN_LOG_DIR
+    # shellcheck disable=SC2174
+    mkdir --mode=750 --parents "${RUN_LOG_DIR}"
+    chgrp adm "${RUN_LOG_DIR}"
 
     # This log file contains all events
-    LOG_FILE="${LOG_DIR}/autosysadmin.log"
-    readonly LOG_FILE
+    RUN_LOG_FILE="${RUN_LOG_DIR}/autosysadmin.log"
+    readonly RUN_LOG_FILE
 
     # This log file contains notable actions
-    ACTIONS_FILE="${LOG_DIR}/actions.log"
+    ACTIONS_FILE="${RUN_LOG_DIR}/actions.log"
     readonly ACTIONS_FILE
     touch "${ACTIONS_FILE}"
     # This log file contains abort reasons (if any)
-    ABORT_FILE="${LOG_DIR}/abort.log"
+    ABORT_FILE="${RUN_LOG_DIR}/abort.log"
     readonly ABORT_FILE
     # touch "${ABORT_FILE}"
 
@@ -91,7 +100,7 @@ initialize() {
     test -f /etc/evolinux/autosysadmin && source /etc/evolinux/autosysadmin
 
     log_all "Begin ${PROGNAME} RUN_ID: ${RUN_ID}"
-    log_all "Log directory is ${LOG_DIR}"
+    log_all "Log directory is ${RUN_LOG_DIR}"
 }
 
 # Executes a list of tasks before exiting:
@@ -561,7 +570,7 @@ log_run() {
 
     printf "[%s] %s[%s]: %s\\n" \
         "${date}" "${PROGNAME}" "${PID}" "${msg}" \
-        >> "${LOG_FILE}"
+        >> "${RUN_LOG_FILE}"
 }
 # Log a message in the system log file (syslog or journald)
 log_global() {
@@ -622,7 +631,7 @@ print_abort_reasons() {
 }
 # Print the content of the main log from the log directory
 print_main_log() {
-    cat "${LOG_FILE}"
+    cat "${RUN_LOG_FILE}"
 }
 # Log an abort reason and quit the script
 log_abort_and_quit() {
@@ -634,7 +643,7 @@ log_abort_and_quit() {
 # into a file in the log directory named after the 1st parameter
 save_in_log_dir() {
     local file_name=$1
-    local file_path="${LOG_DIR}/${file_name}"
+    local file_path="${RUN_LOG_DIR}/${file_name}"
 
     cat /dev/stdin > "${file_path}"
 
@@ -643,7 +652,7 @@ save_in_log_dir() {
 # Return the full path of the file in log directory
 # based on the name in the 1st parameter
 file_path_in_log_dir() {
-    echo "${LOG_DIR}/${1}"
+    echo "${RUN_LOG_DIR}/${1}"
 }
 
 format_mail_success() {
@@ -731,7 +740,7 @@ print_report_information() {
     echo ""
     echo "**Utilisateurs récents**"
     echo ""
-    who_file=$(file_path_in_log_dir "server-state/df.txt")
+    who_file=$(file_path_in_log_dir "who-users")
     if [ -s "${who_file}" ]; then
         cat "${who_file}"
     else
diff --git a/autosysadmin-agent/files/upstream/repair/repair_amavis b/autosysadmin-agent/files/upstream/repair/repair_amavis
deleted file mode 100755
index 5963dc00..00000000
--- a/autosysadmin-agent/files/upstream/repair/repair_amavis
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/bash
-
-: "${AUTOSYSADMIN_LIB:=/usr/local/lib/autosysadmin}"
-source "${AUTOSYSADMIN_LIB}/common.sh" || exit 1
-source "${AUTOSYSADMIN_LIB}/repair.sh" || exit 1
-
-pre_repair
-
-# shellcheck source=./restart_amavis.sh
-source /usr/share/scripts/autosysadmin/auto/restart_amavis.sh
-
-restart_amavis
-
-sendmail success
-
-post_repair
diff --git a/autosysadmin-agent/files/upstream/restart/README b/autosysadmin-agent/files/upstream/restart/README
index 5ac200f2..83a3a9a2 100644
--- a/autosysadmin-agent/files/upstream/restart/README
+++ b/autosysadmin-agent/files/upstream/restart/README
@@ -3,7 +3,7 @@ Autosysadmin "restart auto" scripts
 
 In this directory you can place scripts that will be executed automatically by a cron job (stored in `/etc/cron.d/autosysadmin`).
 
-They must satisfy the default `run-parts(8)` constaints :
+They must satisfy the default `run-parts(8)` constraints :
 
 * be "executable"
 * belong to the Debian cron script namespace (`^[a-zA-Z0-9_-]+$`), example: `restart_amavis`