theo/agence66-nextcloud-docker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: theo:08fdfc3a2e608acdcfe1af3a62805cacb2e27763
Branches Tags
theo:main
...
compare: theo:b3ae8a8622977e220289891ce767a75788e6a745
Branches Tags
theo:main

2 Commits
08fdfc3a2e ... b3ae8a8622

Author SHA1 Message Date
BeauTroll
b3ae8a8622 fix: measure actual Nextcloud user data instead of entire volume 
Changed health check to measure the correct directory:
- Before: ./data (entire Docker volume including app code)
- After: ./data/data (actual Nextcloud user data)

Updated message from "Taille des données" to "Taille des données
utilisateurs" for clarity.

This provides more accurate metrics for monitoring actual user storage usage.

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>
 2025-12-18 03:28:58 +01:00
BeauTroll
7dcffd2ae0 fix: resolve health check issues with Redis and du commands 
Fixed multiple issues in health check script:

1. Redis check failing due to missing .env loading
   - Re-added .env sourcing at script start
   - Redis container doesn't have REDIS_HOST_PASSWORD in env
   - Script needs to load it from .env file

2. Script exiting early when du returns non-zero exit code
   - du returns error code 1 when it can't read some subdirectories (permissions)
   - Even though it outputs the size successfully
   - Added || echo "" to handle non-zero exit codes gracefully
   - Fixed for DATA_SIZE, DB_SIZE, and LOGS_SIZE checks

3. Fixed typo in DB_SIZE validation (was checking DATA_SIZE instead)

These fixes ensure:
- Complete health check output with summary section
- No premature script exits
- Proper Redis authentication testing
- Robust handling of permission errors in du commands

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>
 2025-12-18 03:24:50 +01:00
1 changed files with 14 additions and 6 deletions
Expand all files Collapse all files

20
scripts/check-health.sh
View File

@@ -8,6 +8,14 @@ SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
PROJECT_ROOT="$(cd "$SCRIPT_DIR/.." && pwd)" PROJECT_ROOT="$(cd "$SCRIPT_DIR/.." && pwd)"
cd "$PROJECT_ROOT" cd "$PROJECT_ROOT"
# Charger .env pour accéder aux variables (Redis password, etc.)
if [ -f .env ]; then
set -a
# shellcheck disable=SC1091
source .env
set +a
fi
# Charger les couleurs depuis common.sh # Charger les couleurs depuis common.sh
# shellcheck disable=SC1091 # shellcheck disable=SC1091
source "$SCRIPT_DIR/common.sh" source "$SCRIPT_DIR/common.sh"
@@ -174,17 +182,17 @@ else
check_fail "Utilisation disque: ${DISK_USAGE}% (${DISK_AVAIL} disponible) - CRITIQUE" check_fail "Utilisation disque: ${DISK_USAGE}% (${DISK_AVAIL} disponible) - CRITIQUE"
fi fi
# Vérifier la taille des données # Vérifier la taille des données utilisateurs
if [ -d ./data ]; then if [ -d ./data/data ]; then
DATA_SIZE=$(du -sh ./data 2>/dev/null | cut -f1) DATA_SIZE=$(du -sh ./data/data 2>/dev/null | cut -f1 || echo "")
if [ -z "$DATA_SIZE" ]; then if [ -z "$DATA_SIZE" ]; then
DATA_SIZE="N/A" DATA_SIZE="N/A"
fi fi
check_ok "Taille des données: $DATA_SIZE" check_ok "Taille des données utilisateurs: $DATA_SIZE"
fi fi
if [ -d ./db ]; then if [ -d ./db ]; then
DB_SIZE=$(du -sh ./db 2>/dev/null | cut -f1) DB_SIZE=$(du -sh ./db 2>/dev/null | cut -f1 || echo "")
if [ -z "$DB_SIZE" ]; then if [ -z "$DB_SIZE" ]; then
DB_SIZE="N/A" DB_SIZE="N/A"
fi fi
@@ -239,7 +247,7 @@ if [ -d ./logs ]; then
LOG_COUNT=$(find ./logs -type f 2>/dev/null | wc -l) LOG_COUNT=$(find ./logs -type f 2>/dev/null | wc -l)
check_ok "$LOG_COUNT fichier(s) de log" check_ok "$LOG_COUNT fichier(s) de log"
LOGS_SIZE=$(du -sh ./logs 2>/dev/null | cut -f1) LOGS_SIZE=$(du -sh ./logs 2>/dev/null | cut -f1 || echo "")
if [ -z "$LOGS_SIZE" ]; then if [ -z "$LOGS_SIZE" ]; then
LOGS_SIZE="N/A" LOGS_SIZE="N/A"
fi fi