R de Ren
33a794e35d
New stack:
- stacks/oauth2-proxy/ — per-app sidecars (mlflow, portainer, rabbitmq)
that gate vhosts via nginx auth_request against Keycloak's wbd realm.
Native OIDC wired into:
- grafana (generic_oauth, role-attribute-path → Admin/Editor/Viewer)
- jupyterhub (oauthenticator.GenericOAuthenticator)
- node-red (passport-openidconnect; in-memory state store + users()
resolver because adminAuth doesn't expose req.session)
- jenkins (oic-auth plugin via JCasC; matrix-auth for authz; setup
wizard suppressed; custom image with plugins.txt)
Infra fixes uncovered while bringing the above online:
- nginx-proxy: bump proxy_buffer_size to 16k so oauth2-proxy callbacks
don't 502 on the JWT-bearing Set-Cookie header.
- nginx-proxy: add `resolver 127.0.0.11 valid=30s` so service names
re-resolve after sidecar recreates (was cross-wiring oauth2-proxy
upstreams after restart).
- jupyterhub: pass --allow-root to the singleuser spawner (hub runs as
root inside its container; jupyter-server refused root without flag).
- jupyterhub Dockerfile: install jupyterlab + notebook so
SimpleLocalProcessSpawner has something to launch.
- node-red Dockerfile: install passport-openidconnect into the image
so settings.js can require() it.
- portainer: pre-seed local admin via --admin-password=<bcrypt-hash>
so the 5-minute "no admin → lockout" timer can never trigger.
- deploy.sh: restore executable bit (was 644 in repo).
Admin/viewer policy:
- Created realm role `app-admin` in keycloak wbd realm.
- Grafana maps app-admin → Admin (default Viewer).
- Jenkins matrix-auth grants r.de.ren Overall/Administer, authenticated
users get Overall/Read + Job/Read + View/Read.
- Node-RED: NODERED_ADMIN_USERS env list → permissions "*", others
["read"]. (TODO: switch to app-admin realm role.)
- JupyterHub: JUPYTERHUB_ADMIN_USERS env list. (Same TODO.)
- Gitea: r.de.ren pre-created as local admin; OIDC auto-links via email.
Docs:
- README, cloud/README, stacks/oauth2-proxy/README, and per-stack
READMEs updated to reflect the new state and remove resolved TODOs.
- cloud/.env.example gains all the new OIDC client + cookie-secret keys.
- cloud/README documents the full kcadm realm bootstrap, including the
hardcoded-audience mapper and post-logout redirect URIs that are
non-obvious gotchas.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
74 lines
2.2 KiB
YAML
74 lines
2.2 KiB
YAML
# Cloud / Central layer composition.
|
|
# Pulls in every stack that runs on the central hub and adds cross-stack
|
|
# dependencies (the per-stack composes stay standalone-runnable).
|
|
#
|
|
# Fresh-deploy procedure (see ../docs/architecture.md for the long version):
|
|
# 1. cp .env.example .env && fill secrets
|
|
# 2. Set DNS A records for the 10 short subdomains + vpn.wbd-rd.nl
|
|
# 3. docker compose up -d
|
|
# - nginx-init creates a self-signed bootstrap cert
|
|
# - sql comes up, init.d/01-databases.sh provisions per-app DBs
|
|
# - keycloak / gitea / mlflow wait on sql healthcheck before starting
|
|
# 4. ./deploy.sh — single command. Brings everything up, runs first-time cert
|
|
# issuance via certbot HTTP-01 (SAN over all *.wbd-rd.nl), reloads nginx,
|
|
# smoke-tests every vhost. Idempotent; safe to rerun.
|
|
# 5. Flip ACME_CA_URI from staging → prod in .env, ./deploy.sh again.
|
|
|
|
name: cloud
|
|
|
|
include:
|
|
# Foundation — ingress, DB, ops console
|
|
- ../stacks/nginx-proxy/compose.yml
|
|
- ../stacks/sql/compose.yml
|
|
- ../stacks/portainer/compose.yml
|
|
# Identity + VPN
|
|
- ../stacks/keycloak/compose.yml
|
|
- ../stacks/oauth2-proxy/compose.yml
|
|
- ../stacks/wireguard-server/compose.yml
|
|
# Data
|
|
- ../stacks/influxdb/compose.yml
|
|
# Apps
|
|
- ../stacks/node-red/compose.yml
|
|
- ../stacks/grafana/compose.yml
|
|
- ../stacks/gitea/compose.yml
|
|
- ../stacks/jenkins/compose.yml
|
|
# Messaging + mail
|
|
- ../stacks/rabbitmq/compose.yml
|
|
- ../stacks/postfix/compose.yml
|
|
# ML / notebooks
|
|
- ../stacks/mlflow/compose.yml
|
|
- ../stacks/jupyterhub/compose.yml
|
|
# SensorThings
|
|
- ../stacks/frost/compose.yml
|
|
|
|
# Cross-stack dependencies. Declared at the cloud level so each stack's
|
|
# own compose.yml stays standalone-runnable (no required peers).
|
|
services:
|
|
keycloak:
|
|
depends_on:
|
|
sql:
|
|
condition: service_healthy
|
|
gitea:
|
|
depends_on:
|
|
sql:
|
|
condition: service_healthy
|
|
mlflow:
|
|
depends_on:
|
|
sql:
|
|
condition: service_healthy
|
|
|
|
networks:
|
|
edge:
|
|
name: cloud-edge
|
|
driver: bridge
|
|
app:
|
|
name: cloud-app
|
|
driver: bridge
|
|
data:
|
|
name: cloud-data
|
|
driver: bridge
|
|
internal: true # databases — no internet egress
|
|
mgmt:
|
|
name: cloud-mgmt
|
|
driver: bridge
|