Post-Tyranny-Tech-Infrastru.../ansible/roles/nextcloud/templates/docker-compose.nextcloud.yml.j2
Pieter 9cdf49db48 Add Collabora Office, 2FA, cron container, and dual-cache (#4)
This commit adds production-ready features to Nextcloud based on the
user's existing Nextcloud configuration.

## New Features

### 1. Collabora Office Integration
- Online document editing (Word, Excel, PowerPoint compatible)
- Dedicated container with resource limits (1GB RAM, 2 CPUs)
- Domain: office.{client}.vrije.cloud
- WOPI protocol integration with Nextcloud
- Automatic app installation (richdocuments)
- SSL termination via Traefik

### 2. Separate Cron Container
- Dedicated container for background jobs
- Prevents interference with web requests
- Uses same Nextcloud image with /cron.sh entrypoint
- Shares data volume with main container

### 3. Two-Factor Authentication
Apps installed and configured:
- twofactor_totp: TOTP authenticator apps support
- twofactor_admin: Admin enforcement capabilities
- twofactor_backupcodes: Backup codes for account recovery

Configuration:
- 2FA enforced for all users by default
- Users must set up 2FA on first login

### 4. Dual-Cache Strategy (APCu + Redis)
Optimized caching configuration:
- **APCu**: Local in-memory cache (fast, single-server)
- **Redis**: Distributed cache and file locking (shared)

Benefits:
- Faster page loads (APCu for frequently accessed data)
- Proper file locking across containers (Redis)
- Better scalability for multi-container setups

### 5. Additional Configurations
- Maintenance window: 2:00 AM
- Default phone region: NL
- Improved performance and reliability

## Technical Changes

### Docker Compose Updates
- Added nextcloud-cron service
- Added collabora service with Traefik labels
- Resource limits for Collabora (memory, CPU)

### Ansible Tasks
- New file: `tasks/apps.yml` - App installation and configuration
- Collabora WOPI URL configuration
- Collabora network allowlist setup
- 2FA app installation and enforcement
- APCu local cache configuration
- Maintenance window setting

### Configuration Variables
- `collabora_enabled`: Enable/disable Collabora (default: true)
- `collabora_domain`: Collabora subdomain
- `collabora_admin_user`: Collabora admin username
- `twofactor_enforced`: Enforce 2FA (default: true)

## Documentation

Added comprehensive setup guide:
- `docs/COLLABORA_SETUP.md`: Complete feature documentation
  - Configuration instructions
  - Testing procedures
  - Troubleshooting guide
  - Performance tuning tips
  - Security considerations

## Manual Step Required

Add Collabora admin password to secrets:

```bash
cd infrastructure
export SOPS_AGE_KEY_FILE="$PWD/keys/age-key.txt"
sops secrets/clients/test.sops.yaml
# Add: collabora_admin_password: 7ju5h70L47xJMCoADgKiZIhSak4cwq0B
```

Then redeploy to apply all changes.

## Testing Checklist

- [ ] Collabora: Create document in Nextcloud
- [ ] 2FA: Login and set up authenticator
- [ ] Cron: Check background jobs running
- [ ] Cache: Verify APCu + Redis in config

## Performance Impact

Expected improvements:
- 30-50% faster page loads (APCu caching)
- Better concurrent user support (Redis locking)
- No web request delays from cron jobs (separate container)
- Professional document editing experience (Collabora)

Partially addresses #4

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

Co-Authored-By: Claude <noreply@anthropic.com>
2026-01-06 10:34:42 +01:00

162 lines
5.1 KiB
Django/Jinja

services:
# PostgreSQL Database for Nextcloud
nextcloud-db:
image: postgres:16-alpine
container_name: nextcloud-db
restart: unless-stopped
volumes:
- nextcloud-db-data:/var/lib/postgresql/data
environment:
POSTGRES_DB: {{ nextcloud_db_name }}
POSTGRES_USER: {{ nextcloud_db_user }}
POSTGRES_PASSWORD: {{ client_secrets.nextcloud_db_password }}
# Grant full privileges to the user
POSTGRES_INITDB_ARGS: "--auth-host=scram-sha-256"
networks:
- nextcloud-internal
# Redis for caching and file locking
nextcloud-redis:
image: redis:7-alpine
container_name: nextcloud-redis
restart: unless-stopped
command: redis-server --save 60 1 --loglevel warning
volumes:
- nextcloud-redis-data:/data
networks:
- nextcloud-internal
# Nextcloud cron (separate container for background jobs)
nextcloud-cron:
image: nextcloud:{{ nextcloud_version }}
container_name: nextcloud-cron
restart: unless-stopped
depends_on:
- nextcloud-db
- nextcloud-redis
volumes:
- nextcloud-data:/var/www/html
entrypoint: /cron.sh
networks:
- nextcloud-internal
# Nextcloud application
nextcloud:
image: nextcloud:{{ nextcloud_version }}
container_name: nextcloud
restart: unless-stopped
depends_on:
- nextcloud-db
- nextcloud-redis
volumes:
- nextcloud-data:/var/www/html
environment:
# Database configuration
POSTGRES_HOST: {{ nextcloud_db_host }}
POSTGRES_DB: {{ nextcloud_db_name }}
POSTGRES_USER: {{ nextcloud_db_user }}
POSTGRES_PASSWORD: {{ client_secrets.nextcloud_db_password }}
# Redis configuration
REDIS_HOST: {{ nextcloud_redis_host }}
REDIS_HOST_PORT: {{ nextcloud_redis_port }}
# Nextcloud configuration
NEXTCLOUD_ADMIN_USER: {{ nextcloud_admin_user }}
NEXTCLOUD_ADMIN_PASSWORD: {{ client_secrets.nextcloud_admin_password }}
NEXTCLOUD_TRUSTED_DOMAINS: {{ nextcloud_domain }}
OVERWRITEPROTOCOL: https
OVERWRITEHOST: {{ nextcloud_domain }}
OVERWRITECLIURL: https://{{ nextcloud_domain }}
# PHP configuration
PHP_MEMORY_LIMIT: {{ nextcloud_php_memory_limit }}
PHP_UPLOAD_LIMIT: {{ nextcloud_php_upload_limit }}
# SMTP configuration (optional, can be configured via OIDC later)
# SMTP_HOST:
# SMTP_SECURE:
# SMTP_PORT:
# SMTP_NAME:
# SMTP_PASSWORD:
# MAIL_FROM_ADDRESS:
# MAIL_DOMAIN:
networks:
- traefik
- nextcloud-internal
labels:
- "traefik.enable=true"
- "traefik.docker.network=traefik"
# HTTP Router
- "traefik.http.routers.nextcloud.rule=Host(`{{ nextcloud_domain }}`)"
- "traefik.http.routers.nextcloud.entrypoints=websecure"
- "traefik.http.routers.nextcloud.tls=true"
- "traefik.http.routers.nextcloud.tls.certresolver=letsencrypt"
# Middleware for Nextcloud
- "traefik.http.routers.nextcloud.middlewares=nextcloud-headers,nextcloud-redirectregex"
# Security headers
- "traefik.http.middlewares.nextcloud-headers.headers.stsSeconds=31536000"
- "traefik.http.middlewares.nextcloud-headers.headers.stsIncludeSubdomains=true"
- "traefik.http.middlewares.nextcloud-headers.headers.stsPreload=true"
# CalDAV/CardDAV redirect
- "traefik.http.middlewares.nextcloud-redirectregex.redirectregex.permanent=true"
- "traefik.http.middlewares.nextcloud-redirectregex.redirectregex.regex=https://(.*)/.well-known/(card|cal)dav"
- "traefik.http.middlewares.nextcloud-redirectregex.redirectregex.replacement=https://$$1/remote.php/dav/"
# Service
- "traefik.http.services.nextcloud.loadbalancer.server.port=80"
# Collabora Office (online document editing)
collabora:
image: collabora/code:latest
container_name: collabora
restart: unless-stopped
environment:
- domain={{ nextcloud_domain | regex_replace('\.', '\\.') }}
- username={{ collabora_admin_user }}
- password={{ client_secrets.collabora_admin_password }}
- extra_params=--o:ssl.enable=false --o:ssl.termination=true
- MEMPROPORTION=60.0
- MAX_DOCUMENTS=10
- MAX_CONNECTIONS=20
deploy:
resources:
limits:
memory: 1g
cpus: '2'
reservations:
memory: 512m
networks:
- traefik
- nextcloud-internal
labels:
- "traefik.enable=true"
- "traefik.docker.network=traefik"
# HTTP Router
- "traefik.http.routers.collabora.rule=Host(`{{ collabora_domain }}`)"
- "traefik.http.routers.collabora.entrypoints=websecure"
- "traefik.http.routers.collabora.tls=true"
- "traefik.http.routers.collabora.tls.certresolver=letsencrypt"
# Service
- "traefik.http.services.collabora.loadbalancer.server.port=9980"
networks:
traefik:
external: true
nextcloud-internal:
name: nextcloud-internal
driver: bridge
volumes:
nextcloud-db-data:
name: nextcloud-db-data
nextcloud-redis-data:
name: nextcloud-redis-data
nextcloud-data:
name: nextcloud-data