Compare commits

...

10 Commits

Author SHA1 Message Date
BeauTroll
fc1cac8e5a fix: properly configure Apache MPM Prefork with dedicated config file
- Create dedicated apache/mpm_prefork.conf to override default MPM settings
- Mount mpm_prefork.conf to /etc/apache2/mods-available/ to properly apply limits
- Remove MPM config from nextcloud.conf (was being ignored)
- Set ServerLimit and MaxRequestWorkers to 400 (up from 150 default)
- Configure optimized worker settings for better concurrency

This fixes the "server reached MaxRequestWorkers" error that was causing
sync failures and 404 errors by properly overriding Apache's default
configuration file instead of trying to set it in conf-enabled.

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

Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>
2026-01-03 04:14:41 +01:00
BeauTroll
5d610b9177 increase server limit 2026-01-03 04:07:31 +01:00
BeauTroll
8096d8985b Merge remote-tracking branch 'origin/main' 2026-01-03 04:03:16 +01:00
BeauTroll
8462b10e3b fix: increase Apache MaxRequestWorkers and optimize performance settings
- Increase MaxRequestWorkers from 150 to 400 to prevent "server reached MaxRequestWorkers" errors
- Configure MPM Prefork module with optimized worker settings
- Add AllowEncodedSlashes NoDecode for special characters in filenames
- Increase Redis maxmemory from 512MB to 2GB for better caching
- Extend PHP execution times from 1800s to 7200s for large operations
- Increase MariaDB max_allowed_packet to 1GB for large file uploads

These changes resolve sync failures caused by Apache worker exhaustion.

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

Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>
2026-01-03 04:00:12 +01:00
root
6bdd8e918c add traefik transport 2025-12-23 01:28:12 +01:00
root
44ec0a004a remove uncessary labels 2025-12-23 01:04:16 +01:00
root
c403419ea1 adapt for traefik labels 2025-12-23 00:23:18 +01:00
BeauTroll
a1b51599c6 feat: expose Apache logs to host for fail2ban integration
- Mount Apache logs directory to ./logs/apache
- Configure JSON file logging driver with rotation
- Set max log size to 10MB with 3 files retention
- Enable fail2ban to monitor access logs directly
- Prevents need for systemd service to export logs

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

Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>
2025-12-20 21:03:48 +01:00
BeauTroll
123f7b6a9c feat: add custom Docker image with ffmpeg for video previews
- Create Dockerfile extending nextcloud:latest with ffmpeg
- Add .dockerignore to optimize build context
- Update docker-compose.yml to use custom image build
- Modify update.sh to rebuild custom image on updates
- Document custom image setup in README
- Enable video preview generation for .mov, .mp4 files

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

Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>
2025-12-20 13:51:19 +01:00
BeauTroll
f02c9b36b2 chore: remove unused enable-modules.sh script
- Script not mounted in Docker container
- Cannot be executed from container
- Commands already documented in README
- Reduces maintenance overhead

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

Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>
2025-12-20 13:12:56 +01:00
9 changed files with 165 additions and 28 deletions

17
.dockerignore Normal file
View File

@@ -0,0 +1,17 @@
# Données Nextcloud
data/
db/
backups/
logs/
# Docker
docker-compose*.yml
.env*
# Git
.git/
.gitignore
# Documentation
README.md
*.md

7
Dockerfile Normal file
View File

@@ -0,0 +1,7 @@
FROM nextcloud:latest
# Installer ffmpeg pour les previews vidéo
RUN apt-get update && \
apt-get install -y --no-install-recommends \
ffmpeg \
&& rm -rf /var/lib/apt/lists/*

View File

@@ -16,12 +16,13 @@ Déploiement Nextcloud avec Docker Compose comprenant MariaDB 10.11, Redis (cach
## Architecture ## Architecture
Le déploiement comprend 4 services: Le déploiement comprend 5 services:
- **nextcloud**: Application Nextcloud (port 127.0.0.1:8888:80) - **nextcloud**: Application Nextcloud avec image personnalisée (inclut ffmpeg) - port 127.0.0.1:8888:80
- **db**: MariaDB 10.11 avec healthcheck - **db**: MariaDB 10.11 avec healthcheck
- **redis**: Cache Redis avec politique LRU (512MB max) - **redis**: Cache Redis avec politique LRU (512MB max)
- **cron**: Tâches planifiées Nextcloud (préviews, nettoyage, etc.) - **cron**: Tâches planifiées Nextcloud (préviews, nettoyage, etc.)
- **backup-cron**: Système de backup automatisé (quotidien)
**Réseaux**: **Réseaux**:
@@ -113,6 +114,72 @@ Les paramètres PHP sont préconfigurés dans docker-compose.yml:
Ces valeurs permettent l'upload de fichiers jusqu'à 2GB. Ces valeurs permettent l'upload de fichiers jusqu'à 2GB.
### Image Docker personnalisée
Le projet utilise une image Docker personnalisée basée sur `nextcloud:latest` qui inclut **ffmpeg** pour la génération de previews vidéo (.mov, .mp4, etc.).
**Dockerfile:**
```dockerfile
FROM nextcloud:latest
# Installer ffmpeg pour les previews vidéo
RUN apt-get update && \
apt-get install -y --no-install-recommends \
ffmpeg \
&& rm -rf /var/lib/apt/lists/*
```
**Builder l'image:**
```bash
# Builder l'image custom
docker compose build nextcloud
# Ou forcer le rebuild
docker compose build --no-cache nextcloud
```
**Vérifier ffmpeg:**
```bash
docker compose exec nextcloud ffmpeg -version
```
**Activer les previews vidéo:**
Après le premier démarrage, activez les providers de preview pour les vidéos:
```bash
docker compose exec -u www-data nextcloud php occ config:system:set enabledPreviewProviders 0 --value="OC\\Preview\\Movie"
docker compose exec -u www-data nextcloud php occ config:system:set enabledPreviewProviders 1 --value="OC\\Preview\\PNG"
docker compose exec -u www-data nextcloud php occ config:system:set enabledPreviewProviders 2 --value="OC\\Preview\\JPEG"
docker compose exec -u www-data nextcloud php occ config:system:set enabledPreviewProviders 3 --value="OC\\Preview\\GIF"
docker compose exec -u www-data nextcloud php occ config:system:set enabledPreviewProviders 4 --value="OC\\Preview\\BMP"
# Générer les previews pour un utilisateur
docker compose exec -u www-data nextcloud php occ preview:generate-all nom_utilisateur
```
**Note:** L'image est buildée localement et taguée `nextcloud-custom:latest`. Lors des mises à jour Nextcloud, pensez à rebuild l'image.
# Server Transport Traefik
Ajouter à traefik.yml :
```yml
serversTransport:
nextcloud-transport:
forwardingTimeouts:
dialTimeout: 30s
responseHeaderTimeout: 0s
idleConnTimeout: 3600s
```
OU au docker-compose.yml
```yml
command:
- "--serverstransport.forwardingtimeouts.dialtimeout=30s"
- "--serverstransport.forwardingtimeouts.responseheadertimeout=0"
- "--serverstransport.forwardingtimeouts.idleconntimeout=3600s"
```
### Configuration Apache pour Traefik ### Configuration Apache pour Traefik
Le fichier `apache/nextcloud.conf` configure Apache pour fonctionner correctement derrière le reverse proxy Traefik. Le fichier `apache/nextcloud.conf` configure Apache pour fonctionner correctement derrière le reverse proxy Traefik.
@@ -164,6 +231,9 @@ docker compose logs nextcloud --tail=20
### Première installation ### Première installation
```bash ```bash
# Builder l'image personnalisée (inclut ffmpeg)
docker compose build nextcloud
# Démarrer tous les services # Démarrer tous les services
make up make up
@@ -269,7 +339,7 @@ make update
1. 💾 **Backup automatique de sécurité** 1. 💾 **Backup automatique de sécurité**
- Exécute `scripts/backup.sh` complet - Exécute `scripts/backup.sh` complet
- Archive créée dans `./backups/` - Archive créée dans `./backups/`
2. 📥 Télécharge la nouvelle image Docker Nextcloud 2. 🔨 Rebuild l'image personnalisée avec la nouvelle version Nextcloud
3. ⏸️ Active le mode maintenance 3. ⏸️ Active le mode maintenance
4. 🔄 Redémarre les containers avec `--force-recreate` 4. 🔄 Redémarre les containers avec `--force-recreate`
5. ⏳ Attend que Nextcloud soit prêt (health check jusqu'à 60s) 5. ⏳ Attend que Nextcloud soit prêt (health check jusqu'à 60s)

View File

@@ -1,12 +0,0 @@
#!/bin/bash
# Active les modules Apache nécessaires pour Nextcloud derrière Traefik
a2enmod headers
a2enmod rewrite
a2enmod dir
a2enmod mime
a2enmod remoteip # Pour récupérer les vraies IPs clients
a2enmod env # Pour SetEnvIf (détection HTTPS)
# Redémarre Apache
apache2ctl graceful

16
apache/mpm_prefork.conf Normal file
View File

@@ -0,0 +1,16 @@
# prefork MPM
# StartServers: number of server processes to start
# MinSpareServers: minimum number of server processes which are kept spare
# MaxSpareServers: maximum number of server processes which are kept spare
# ServerLimit: maximum value for MaxRequestWorkers (must be set before MaxRequestWorkers)
# MaxRequestWorkers: maximum number of server processes allowed to start
# MaxConnectionsPerChild: maximum number of requests a server process serves
<IfModule mpm_prefork_module>
ServerLimit 400
StartServers 10
MinSpareServers 10
MaxSpareServers 20
MaxRequestWorkers 400
MaxConnectionsPerChild 1000
</IfModule>

View File

@@ -1,5 +1,10 @@
# Configuration pour reverse proxy Traefik # Configuration pour reverse proxy Traefik
# Récupération de l'IP réelle du client via X-Forwarded-For # Récupération de l'IP réelle du client via X-Forwarded-For
ServerName cloud.agence66.fr
# Autoriser les caractères spéciaux encodés dans les noms de fichiers
AllowEncodedSlashes NoDecode
RemoteIPHeader X-Forwarded-For RemoteIPHeader X-Forwarded-For
RemoteIPTrustedProxy 172.16.0.0/12 RemoteIPTrustedProxy 172.16.0.0/12
RemoteIPTrustedProxy 10.0.0.0/8 RemoteIPTrustedProxy 10.0.0.0/8

View File

@@ -13,3 +13,6 @@ binlog_format = ROW
# Connections # Connections
max_connections = 200 max_connections = 200
# Gros fichiers - augmenter la taille max des paquets
max_allowed_packet = 1G

View File

@@ -1,12 +1,21 @@
services: services:
nextcloud: nextcloud:
image: nextcloud:latest build: .
image: nextcloud-custom:latest
restart: unless-stopped restart: unless-stopped
ports: ports:
- "127.0.0.1:8888:80" - "127.0.0.1:8888:80"
volumes: volumes:
- ./data:/var/www/html - ./data:/var/www/html
- ./apache/nextcloud.conf:/etc/apache2/conf-enabled/nextcloud.conf:ro - ./apache/nextcloud.conf:/etc/apache2/conf-enabled/nextcloud.conf:ro
- ./apache/mpm_prefork.conf:/etc/apache2/mods-available/mpm_prefork.conf:ro
- ./logs/apache:/var/log/apache2
logging:
driver: "json-file"
options:
max-size: "10m"
max-file: "3"
tag: "nextcloud"
environment: environment:
# Database # Database
- MYSQL_HOST=db - MYSQL_HOST=db
@@ -24,16 +33,16 @@ services:
- REDIS_HOST_PASSWORD=${REDIS_HOST_PASSWORD} - REDIS_HOST_PASSWORD=${REDIS_HOST_PASSWORD}
# PHP # PHP
- PHP_MEMORY_LIMIT=4096M - PHP_MEMORY_LIMIT=4096M
- PHP_UPLOAD_MAX_FILESIZE=2G - PHP_UPLOAD_MAX_FILESIZE=10G
- PHP_POST_MAX_SIZE=2G - PHP_POST_MAX_SIZE=10G
- PHP_MAX_EXECUTION_TIME=1800 - PHP_MAX_EXECUTION_TIME=7200
- PHP_MAX_INPUT_TIME=1800 - PHP_MAX_INPUT_TIME=7200
# - PHP_UPLOAD_MAX_FILESIZE=1024G # - PHP_UPLOAD_MAX_FILESIZE=1024G
# - PHP_POST_MAX_SIZE=1024G # - PHP_POST_MAX_SIZE=1024G
# - PHP_MAX_EXECUTION_TIME=86400 # - PHP_MAX_EXECUTION_TIME=86400
# - PHP_MAX_INPUT_TIME=86400 # - PHP_MAX_INPUT_TIME=86400
# Apache # Apache
- APACHE_BODY_LIMIT=2147483648 - APACHE_BODY_LIMIT=0
healthcheck: healthcheck:
test: ["CMD", "curl", "-f", "http://localhost/status.php"] test: ["CMD", "curl", "-f", "http://localhost/status.php"]
interval: 30s interval: 30s
@@ -47,16 +56,32 @@ services:
networks: networks:
- nextcloud-net - nextcloud-net
- traefik-net - traefik-net
labels:
- "traefik.enable=true"
# Router configuration
- "traefik.http.routers.cloud.rule=Host(`${NEXTCLOUD_DOMAIN}`)"
- "traefik.http.routers.cloud.entrypoints=websecure"
- "traefik.http.routers.cloud.tls.certresolver=letsencrypt"
- "traefik.http.routers.cloud.middlewares=nextcloud-headers,nextcloud-redirect"
# Service configuration
- "traefik.http.services.cloud.loadbalancer.server.port=80"
- "traefik.http.services.cloud.loadbalancer.serverstransport=nextcloud-transport"
# Middleware: Headers
- "traefik.http.middlewares.nextcloud-headers.headers.customrequestheaders.X-Forwarded-Proto=https"
- "traefik.http.middlewares.nextcloud-headers.headers.customresponseheaders.Strict-Transport-Security=max-age=15552000"
# Middleware: Redirect pour CalDAV/CardDAV
- "traefik.http.middlewares.nextcloud-redirect.redirectregex.regex=https://(.*)/.well-known/(card|cal)dav"
- "traefik.http.middlewares.nextcloud-redirect.redirectregex.replacement=https://$$1/remote.php/dav/"
- "traefik.http.middlewares.nextcloud-redirect.redirectregex.permanent=true"
redis: redis:
image: redis:alpine image: redis:alpine
restart: unless-stopped restart: unless-stopped
command: redis-server --requirepass ${REDIS_HOST_PASSWORD} --maxmemory 512mb --maxmemory-policy allkeys-lru command: redis-server --requirepass ${REDIS_HOST_PASSWORD} --maxmemory 2gb --maxmemory-policy allkeys-lru
networks: networks:
- nextcloud-net - nextcloud-net
cron: cron:
image: nextcloud:latest image: nextcloud-custom:latest
restart: always restart: always
volumes_from: volumes_from:
- nextcloud - nextcloud

View File

@@ -80,10 +80,16 @@ cp docker-compose.yml "$COMPOSE_BACKUP" || {
} }
log "INFO" "docker-compose.yml sauvegardé: $COMPOSE_BACKUP" log "INFO" "docker-compose.yml sauvegardé: $COMPOSE_BACKUP"
# Pull nouvelle image # Pull nouvelle image de base et rebuild image custom
log "INFO" "Téléchargement de la nouvelle version..." log "INFO" "Téléchargement de la nouvelle version de base..."
if ! docker-compose pull nextcloud 2>&1 | tee -a "$LOG_FILE"; then if ! docker pull nextcloud:latest 2>&1 | tee -a "$LOG_FILE"; then
log "ERROR" "Erreur lors du téléchargement de l'image" log "ERROR" "Erreur lors du téléchargement de l'image de base"
exit 1
fi
log "INFO" "Rebuild de l'image personnalisée (avec ffmpeg)..."
if ! docker-compose build --no-cache nextcloud 2>&1 | tee -a "$LOG_FILE"; then
log "ERROR" "Erreur lors du rebuild de l'image personnalisée"
exit 1 exit 1
fi fi