issue-cert: probe both smallstep password locations (secrets/password on older images)
This commit is contained in:
@@ -31,11 +31,17 @@ cd "$BENCH_DIR"
|
|||||||
CA_PORT=${CA_PORT:-8443}
|
CA_PORT=${CA_PORT:-8443}
|
||||||
CA_CONNECT=${CA_CONNECT:-localhost} # see bootstrap.sh: SAN-valid AND resolvable
|
CA_CONNECT=${CA_CONNECT:-localhost} # see bootstrap.sh: SAN-valid AND resolvable
|
||||||
CA_URL="https://${CA_CONNECT}:${CA_PORT}"
|
CA_URL="https://${CA_CONNECT}:${CA_PORT}"
|
||||||
CONTAINER_PW="/home/step/password" # bootstrap.sh: pki/stepca/password in-container
|
|
||||||
|
|
||||||
step() { docker compose exec -T step-ca step "$@"; }
|
step() { docker compose exec -T step-ca step "$@"; }
|
||||||
incca() { docker compose exec -T step-ca "$@"; }
|
incca() { docker compose exec -T step-ca "$@"; }
|
||||||
|
|
||||||
|
# CA/provisioner password file, as seen INSIDE the container. Location varies by
|
||||||
|
# smallstep image version (newer: $STEPPATH/password, older: $STEPPATH/secrets/
|
||||||
|
# password) — probe both, like bootstrap.sh does.
|
||||||
|
# shellcheck disable=SC2016 # $f expands in the CONTAINER's sh, not here
|
||||||
|
CONTAINER_PW=$(incca sh -c 'for f in /home/step/password /home/step/secrets/password; do [ -f "$f" ] && { echo "$f"; exit 0; }; done; exit 1') \
|
||||||
|
|| { echo "ERROR: no CA password file in the step-ca container (/home/step{,/secrets}/password) — did the CA auto-init? Check: docker compose logs step-ca" >&2; exit 1; }
|
||||||
|
|
||||||
echo "==> issuing audit-collector cert (CN/SAN: $AUDIT_HOST) from the fleet CA"
|
echo "==> issuing audit-collector cert (CN/SAN: $AUDIT_HOST) from the fleet CA"
|
||||||
incca mkdir -p /export/audit
|
incca mkdir -p /export/audit
|
||||||
step ca certificate "$AUDIT_HOST" \
|
step ca certificate "$AUDIT_HOST" \
|
||||||
|
|||||||
Reference in New Issue
Block a user