Files
buryan-infra/ops/sprintB/fix-vaultwarden-compose.sh
T
root d964307be3 Sprint B: Vaultwarden SSO fix — report and closure
- Root cause: два OIDC-контура, nginx 8001→8081, provider не привязан к Application, issuer trailing slash
- Fix: нативный SSO Vaultwarden, oauth2-proxy отключён, Authentik Application создан
- Отчёт: ops/sprintB/vault-sso-fix-report.md
- Closes #1
2026-09-25 17:38:51 +03:00

74 lines
2.1 KiB
Bash
Executable File

#!/bin/bash
set -euo pipefail
COMPOSE=/opt/files-lxc/docker-compose.yml
CT=109
TS=$(date +%Y%m%d-%H%M%S)
pct exec "$CT" -- cp "$COMPOSE" "${COMPOSE}.bak.${TS}"
echo "✅ backup: ${COMPOSE}.bak.${TS}"
NEW_BLOCK=$(mktemp)
cat > "$NEW_BLOCK" <<'YAML'
vaultwarden:
image: vaultwarden/server:latest
container_name: vaultwarden
restart: unless-stopped
environment:
- TZ=Europe/Moscow
- SIGNUPS_ALLOWED=false
- DOMAIN=${VW_DOMAIN}
- SSO_ENABLED=true
- SSO_AUTHORITY=${VW_SSO_ISSUER}
- SSO_CLIENT_ID=${VW_OIDC_CLIENT_ID}
- SSO_CLIENT_SECRET=${VW_OIDC_CLIENT_SECRET}
- SSO_SCOPES=openid profile email groups
- SSO_USERNAME_CLAIM=preferred_username
- SSO_EMAIL_CLAIM=email
- SSO_NAME_CLAIM=name
volumes:
- ./vaultwarden/data:/data
ports:
- '8081:80'
networks:
- files_net
YAML
pct exec "$CT" -- cat "$COMPOSE" > /tmp/compose.orig.yml
awk -v newblock_file="$NEW_BLOCK" '
BEGIN {
in_vw = 0
while ((getline line < newblock_file) > 0) newblock = newblock line "\n"
close(newblock_file)
}
/^ vaultwarden:[[:space:]]*$/ { print newblock; in_vw = 1; next }
in_vw {
if ($0 ~ /^ [a-zA-Z0-9_-]+:[[:space:]]*$/) { in_vw = 0; print; next }
next
}
{ print }
' /tmp/compose.orig.yml > /tmp/compose.new.yml
LINES=$(wc -l < /tmp/compose.new.yml)
VW_COUNT=$(grep -c '^ vaultwarden:' /tmp/compose.new.yml || true)
NET_OK=$(grep -c '^networks:' /tmp/compose.new.yml || true)
if [ "$LINES" -lt 10 ] || [ "$VW_COUNT" -ne 1 ] || [ "$NET_OK" -lt 1 ]; then
echo "❌ Проверка не прошла: lines=$LINES vw=$VW_COUNT networks=$NET_OK"
echo "Оригинал: /tmp/compose.orig.yml, изменения НЕ применены"
exit 1
fi
echo "--- diff ---"
diff -u /tmp/compose.orig.yml /tmp/compose.new.yml || true
echo "------------"
pct push "$CT" /tmp/compose.new.yml "$COMPOSE" --perms 644
echo "▶ docker compose config ..."
pct exec "$CT" -- docker compose -f "$COMPOSE" config >/dev/null && echo "✅ compose OK"
rm -f "$NEW_BLOCK"
echo "✅ done. Откат: pct exec $CT -- cp ${COMPOSE}.bak.${TS} $COMPOSE"