diff --git a/README.md b/README.md index 9fe5461..0edcb7b 100644 --- a/README.md +++ b/README.md @@ -67,5 +67,5 @@ Bootstrap Authentik on Synology: ```bash cd /volume1/docker/dc-cms/source/infra -sudo /usr/local/bin/docker compose --env-file .env.synology -f docker-compose.yml exec -T authentik-worker sh -lc 'if command -v ak >/dev/null 2>&1; then ak shell < /bootstrap/bootstrap-cms.py; else /lifecycle/ak shell < /bootstrap/bootstrap-cms.py; fi' +sudo /usr/local/bin/docker compose --env-file .env.synology -f docker-compose.yml exec -T authentik-worker sh -lc 'set -e; export PATH="${VENV_PATH}/bin:${PATH}"; for bp in default/flow-default-authentication-flow.yaml default/flow-default-invalidation-flow.yaml default/flow-default-provider-authorization-implicit-consent.yaml; do /lifecycle/ak apply_blueprint "$bp"; done; /lifecycle/ak shell < /bootstrap/bootstrap-cms.py' ``` diff --git a/infra/scripts/bootstrap-authentik.sh b/infra/scripts/bootstrap-authentik.sh index a2c3c5e..0bbde15 100755 --- a/infra/scripts/bootstrap-authentik.sh +++ b/infra/scripts/bootstrap-authentik.sh @@ -6,5 +6,15 @@ INFRA_DIR="$(cd "${SCRIPT_DIR}/.." && pwd)" cd "${INFRA_DIR}" -docker compose --env-file "${CMS_ENV_FILE:-.env}" -f docker-compose.yml exec -T authentik-worker sh -lc \ - 'if command -v ak >/dev/null 2>&1; then ak shell < /bootstrap/bootstrap-cms.py; else /lifecycle/ak shell < /bootstrap/bootstrap-cms.py; fi' +docker compose --env-file "${CMS_ENV_FILE:-.env}" -f docker-compose.yml exec -T authentik-worker sh -lc ' + set -e + export PATH="${VENV_PATH}/bin:${PATH}" + for bp in \ + default/flow-default-authentication-flow.yaml \ + default/flow-default-invalidation-flow.yaml \ + default/flow-default-provider-authorization-implicit-consent.yaml + do + /lifecycle/ak apply_blueprint "$bp" + done + /lifecycle/ak shell < /bootstrap/bootstrap-cms.py +'