fix: sitemap proxied from nextjs app (#183)

* fix: sitemap proxied from nextjs app * fix: robots.txt to new sitemap * fix: cpu limit * fix: better init strapi (#192) --------- Co-authored-by: YoanRos <[email protected]> Co-authored-by: Matéo Mévollon <[email protected]> Co-authored-by: Matéo Mévollon <[email protected]>
SocialGouv · Jul 8, 2024 · ec9c454 · ec9c454
1 parent be85e5f
commit ec9c454
Show file tree

Hide file tree

Showing 4 changed files with 55 additions and 10 deletions.
diff --git a/.kontinuous/env/dev/values.yaml b/.kontinuous/env/dev/values.yaml
@@ -1,9 +1,4 @@
 api:
-  cmd: true
-  args:
-    - sh
-    - -c
-    - "yarn strapi import --force -f seed-data.tar.gz && yarn start"
   ~preDeploy.cleaner:
     match:
       kind: Deployment
@@ -18,13 +13,37 @@ api:
   # so public cannot be a volume, it must be its parent
   # see https://github.com/strapi/strapi/issues/17809
   initContainers:
-    - name: move-public-to-volume
+    - name: import-and-prepare
       image:
         "{{ .Values.global.registry }}/{{ .Values.global.projectName }}/{{
         .Values.global.imageRepository }}/api:{{ .Values.global.imageTag }}"
       command: ["/bin/sh", "-c"]
       args:
-        - cp -r public/. /mnt/public;
+        - |
+          yarn strapi import --force -f seed-data.tar.gz && \
+          cp -r public/. /mnt/public
       volumeMounts:
         - name: public
           mountPath: /mnt/public
+      envFrom:
+        - secretRef:
+            name: pg-app
+        - secretRef:
+            name: api
+      env:
+        - name: DATABASE_HOST
+          value: "$(PGHOST)"
+        - name: DATABASE_PORT
+          value: "$(PGPORT)"
+        - name: DATABASE_NAME
+          value: "$(PGDATABASE)"
+        - name: DATABASE_USERNAME
+          value: "$(PGUSER)"
+        - name: DATABASE_PASSWORD
+          value: "$(PGPASSWORD)"
+        - name: HOST
+          value: "0.0.0.0"
+        - name: PORT
+          value: "1337"
+        - name: DATABASE_CLIENT
+          value: postgres
diff --git a/.kontinuous/values.yaml b/.kontinuous/values.yaml
@@ -15,8 +15,6 @@ api:
   ~needs: ["build-api", "pg"]
   imagePackage: api
   probesPath: /_health
-  startupProbe:
-    initialDelaySeconds: 300
   containerPort: "1337"
   envFrom:
     - secretRef:

diff --git a/next-app/app/sitemap.xml/route.ts b/next-app/app/sitemap.xml/route.ts
@@ -0,0 +1,28 @@
+// sitemap/index.xml
+// https://api-ozensemble-site.fabrique.social.gouv.fr/api/sitemap/index.xml
+export const dynamic = "force-dynamic" // defaults to auto
+
+export async function GET() {
+  const sitemap = await fetch(
+    "https://api-ozensemble-site.fabrique.social.gouv.fr/api/sitemap/index.xml"
+  ).then((res) => res.text())
+
+  if (!sitemap) {
+    return new Response("It exists but its fucked up", {
+      headers: {
+        "Content-Type": "text/xml",
+      },
+    })
+  }
+  return new Response(
+    sitemap.replace(
+      `<?xml-stylesheet type="text/xsl" href="xsl/sitemap.xsl"?>`,
+      ``
+    ),
+    {
+      headers: {
+        "Content-Type": "text/xml",
+      },
+    }
+  )
+}
diff --git a/next-app/public/robots.txt b/next-app/public/robots.txt
@@ -2,4 +2,4 @@ User-agent: *
 Allow: /public/  # Allow crawling of pages in the /public/ directory
 Allow: /images/  # Allow crawling of images
 Disallow: /fb-redirection/
-Sitemap: https://api-ozensemble-site.fabrique.social.gouv.fr/api/sitemap/index.xml
+Sitemap: https://ozensemble-site.fabrique.social.gouv.fr/sitemap.xml