diff --git a/.github/workflows/build-deploy.yml b/.github/workflows/build-deploy.yml index 9f94a4c..36be1be 100644 --- a/.github/workflows/build-deploy.yml +++ b/.github/workflows/build-deploy.yml @@ -46,7 +46,7 @@ jobs: id: public_url run: | if [ -z "${{ vars.PUBLIC_URL }}" ]; then - PUBLIC_URL="https://${{ needs.env.outputs.app_name_suffix }}.${{ vars.KUBE_INGRESS_BASE_DOMAIN }}" + PUBLIC_URL="https://${{ needs.env.outputs.app_name }}.${{ vars.KUBE_INGRESS_BASE_DOMAIN }}" else PUBLIC_URL="${{ vars.PUBLIC_URL }}" fi @@ -97,10 +97,10 @@ jobs: tags: ${{ steps.meta.outputs.tags }} labels: ${{ steps.meta.outputs.labels }} build-args: | - NUXT_PUBLIC_APP_BASE_URL="${{ needs.vars.outputs.public_url }}" - NUXT_PUBLIC_MATOMO_BASE_URL="${{ vars.NUXT_PUBLIC_MATOMO_BASE_URL }}" - NUXT_PUBLIC_MATOMO_ID="${{ vars.NUXT_PUBLIC_MATOMO_ID }}" - NUXT_PUBLIC_REDMINE_ID="${{ vars.SERVICE_ID }}" + "NUXT_PUBLIC_APP_BASE_URL=${{ needs.vars.outputs.public_url }}" + "NUXT_PUBLIC_MATOMO_BASE_URL=${{ vars.NUXT_PUBLIC_MATOMO_BASE_URL }}" + "NUXT_PUBLIC_MATOMO_ID=${{ vars.NUXT_PUBLIC_MATOMO_ID }}" + "NUXT_PUBLIC_REDMINE_ID=${{ vars.SERVICE_ID }}" cache-from: type=gha cache-to: type=gha,mode=max diff --git a/server/routes/robots.txt.get.ts b/server/routes/robots.txt.get.ts index 9af346f..9082a30 100644 --- a/server/routes/robots.txt.get.ts +++ b/server/routes/robots.txt.get.ts @@ -1,7 +1,6 @@ import { createUrl } from "@acdh-oeaw/lib"; import { z } from "zod"; -console.log(JSON.stringify({ baseUrl: process.env.NUXT_PUBLIC_APP_BASE_URL })); const baseUrl = z.string().url().parse(process.env.NUXT_PUBLIC_APP_BASE_URL); const bots = z.enum(["disabled", "enabled"]).optional().parse(process.env.NUXT_PUBLIC_BOTS); const isIndexable = bots === "enabled";