From 8741167a808b6b313b066b5dd28530b9e1515e87 Mon Sep 17 00:00:00 2001 From: Alexis Ben Miloud--Josselin Date: Thu, 1 Feb 2024 17:04:30 +0100 Subject: [PATCH] Revert last commit --- CHANGELOG.md | 1 - userlogrotate/files/userlogrotate | 6 ------ 2 files changed, 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8a84db8d..4f6fe59a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -67,7 +67,6 @@ The **patch** part changes is incremented if multiple releases happen the same m * vrrpd: variable to force update the switch script (default: false) * webapps/nextcloud: Add Ceph volume to fstab * webapps/nextcloud: Set home directory's mode -* userlogrotate: Use user's primary group when user's name is not an existing group ### Fixed diff --git a/userlogrotate/files/userlogrotate b/userlogrotate/files/userlogrotate index da12a36c..2a76eaaf 100644 --- a/userlogrotate/files/userlogrotate +++ b/userlogrotate/files/userlogrotate @@ -73,9 +73,6 @@ for path in ${SYSTEM_LOGS_SEARCH_PATHS[@]}; do for file in ${log_paths}; do user="$(user_for "${file}")" group="$(group_for "${file}")" - if ! getent group "${user}" > /dev/null 2> /dev/null; then - group="$(id -gn "${user}")" - fi rotate "${file}" "${group}":"${user}" delete_old "$(dirname "${file}")" done @@ -88,9 +85,6 @@ for path in ${APPLICATIVE_LOGS_SEARCH_PATHS[@]}; do for file in ${log_paths}; do user="$(user_for "${file}")" group="$(group_for "${file}")" - if ! getent group "${user}" > /dev/null 2> /dev/null; then - group="$(id -gn "${user}")" - fi rotate "${file}" "${group}":"${user}" delete_old "$(dirname "${file}")" done