diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index f1284dcbf9..cf3f6e5562 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -139,6 +139,8 @@ jobs: OTEL_EXPORTER_OTLP_ENDPOINT: ${{ secrets.OTEL_EXPORTER_OTLP_ENDPOINT }} OTEL_AUTH_HEADER: ${{ secrets.OTEL_AUTH_HEADER }} API_KEY: ${{ secrets.API_KEY }} + NUM_WORKERS: ${{ vars.NUM_WORKERS }} + TURNSTILE_SITE_KEY: ${{ vars.TURNSTILE_SITE_KEY }} SERVER_HOST_MASTERS: ${{ secrets.SERVER_HOST_MASTERS }} SERVER_HOST_FALK2: ${{ secrets.SERVER_HOST_FALK2 }} SERVER_HOST_STAGING: ${{ secrets.SERVER_HOST_STAGING }} diff --git a/deploy.sh b/deploy.sh index 53c90df21d..f327a57a8c 100755 --- a/deploy.sh +++ b/deploy.sh @@ -66,6 +66,9 @@ else GHCR_IMAGE="${GHCR_USERNAME}/${GHCR_REPO}:${VERSION_TAG}" fi +# jwtAudience always matched DOMAIN in the old per-env configs. +JWT_AUDIENCE="$DOMAIN" + if [ "$HOST" == "staging" ]; then print_header "DEPLOYING TO STAGING HOST" SERVER_HOST=$SERVER_HOST_STAGING @@ -138,6 +141,9 @@ API_KEY=$API_KEY DOMAIN=$DOMAIN SUBDOMAIN=$SUBDOMAIN CDN_BASE=$CDN_BASE +JWT_AUDIENCE=$JWT_AUDIENCE +NUM_WORKERS=$NUM_WORKERS +TURNSTILE_SITE_KEY=$TURNSTILE_SITE_KEY OTEL_EXPORTER_OTLP_ENDPOINT=$OTEL_EXPORTER_OTLP_ENDPOINT OTEL_AUTH_HEADER=$OTEL_AUTH_HEADER EOL diff --git a/index.html b/index.html index b196749fde..aca2853cd0 100644 --- a/index.html +++ b/index.html @@ -60,11 +60,15 @@