diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 1e5ab055..fed99f72 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -82,6 +82,7 @@ jobs: echo 'CORS=["https://api-platform.com", "http://localhost", "https://localhost", "http://localhost:3000"]' >> "$GITHUB_ENV" echo "NAMESPACE=prod-website" >> "$GITHUB_ENV" echo "REPLICA=1" >> "$GITHUB_ENV" + echo 'CADDY_X_ROBOTS_TAG="all"' >> "$GITHUB_ENV" else CONTEXT=nonprod if [ "$GITHUB_EVENT_NAME" == "pull_request" ]; then @@ -95,6 +96,7 @@ jobs: echo "REPLICA=1" >> "$GITHUB_ENV" echo "NAMESPACE=nonprod-website" >> "$GITHUB_ENV" echo 'CORS=["https://${{ env.RELEASE_NAME}}.apip.preprod-tilleuls.ovh", "http://localhost", "https://localhost", "http://localhost:3000"]' >> "$GITHUB_ENV" + echo 'CADDY_X_ROBOTS_TAG="noindex, nofollow"' >> "$GITHUB_ENV" fi - name: HELM Deploy run: | @@ -117,6 +119,7 @@ jobs: --set=caddy.image.repository=europe-west1-docker.pkg.dev/${{ secrets.gke-project }}/website/caddy \ --set=caddy.image.tag=${{ inputs.docker-images-version }} \ --set=caddy.image.pullPolicy=Always \ + --set=caddy.xRobotsTag="${{ env.CADDY_X_ROBOTS_TAG }}" \ --set=pwa.image.repository=europe-west1-docker.pkg.dev/${{ secrets.gke-project }}/website/pwa \ --set=pwa.image.tag=${{ inputs.docker-images-version }} \ --set=pwa.image.pullPolicy=Always \ @@ -158,6 +161,7 @@ jobs: --set=caddy.image.repository=europe-west1-docker.pkg.dev/${{ secrets.gke-project }}/website/caddy \ --set=caddy.image.tag=${{ inputs.docker-images-version }} \ --set=caddy.image.pullPolicy=Always \ + --set=caddy.xRobotsTag="${{ env.CADDY_X_ROBOTS_TAG }}" \ --set=pwa.image.repository=europe-west1-docker.pkg.dev/${{ secrets.gke-project }}/website/pwa \ --set=pwa.image.tag=${{ inputs.docker-images-version }} \ --set=pwa.image.pullPolicy=Always \ diff --git a/api/docker/caddy/Caddyfile b/api/docker/caddy/Caddyfile index 0bba5ef2..827ce108 100644 --- a/api/docker/caddy/Caddyfile +++ b/api/docker/caddy/Caddyfile @@ -66,3 +66,5 @@ handle { reverse_proxy http://{$PWA_UPSTREAM} } + +header X-Robots-Tag "{$CADDY_X_ROBOTS_TAG}" diff --git a/helm/api-platform/templates/configmap.yaml b/helm/api-platform/templates/configmap.yaml index 1e5caa49..004e899a 100644 --- a/helm/api-platform/templates/configmap.yaml +++ b/helm/api-platform/templates/configmap.yaml @@ -15,3 +15,4 @@ data: next-root-url: {{ .Values.next.rootUrl | quote }} bucket-s3-upstream: {{ .Values.bucket.s3Upstream | quote }} bucket-s3-name: {{ .Values.bucket.s3Name | quote }} + x-robots-tag: {{ .Values.caddy.xRobotsTag | quote }} diff --git a/helm/api-platform/templates/deployment.yaml b/helm/api-platform/templates/deployment.yaml index fcdb7b25..0631ac48 100644 --- a/helm/api-platform/templates/deployment.yaml +++ b/helm/api-platform/templates/deployment.yaml @@ -58,6 +58,11 @@ spec: configMapKeyRef: name: {{ include "api-platform.fullname" . }} key: bucket-s3-name + - name: CADDY_X_ROBOTS_TAG + valueFrom: + configMapKeyRef: + name: {{ include "api-platform.fullname" . }} + key: x-robots-tag ports: - name: http containerPort: 80 diff --git a/helm/api-platform/values.yaml b/helm/api-platform/values.yaml index b6281e5e..f6577c96 100644 --- a/helm/api-platform/values.yaml +++ b/helm/api-platform/values.yaml @@ -58,6 +58,7 @@ caddy: pullPolicy: IfNotPresent # Overrides the image tag whose default is the chart appVersion. tag: "" + xRobotsTag: "all" resources: requests: cpu: 100m