refactor: remove all legacy directus environment variables and standardize on postgres

.gitea/workflows/deploy.yml

@@ -225,9 +225,9 @@ jobs:
       # Secrets mapping (Database & CMS)
       PAYLOAD_SECRET:          ${{ (needs.prepare.outputs.target == 'testing' && secrets.TESTING_PAYLOAD_SECRET) || (needs.prepare.outputs.target == 'staging' && secrets.STAGING_PAYLOAD_SECRET) || secrets.PAYLOAD_SECRET || secrets.DIRECTUS_SECRET || vars.PAYLOAD_SECRET || 'you-need-to-set-a-payload-secret' }}
       DATABASE_URI:            ${{ (needs.prepare.outputs.target == 'testing' && secrets.TESTING_DATABASE_URI) || (needs.prepare.outputs.target == 'staging' && secrets.STAGING_DATABASE_URI) || secrets.DATABASE_URI || vars.DATABASE_URI }}
-      DIRECTUS_DB_NAME:        ${{ secrets.DIRECTUS_DB_NAME || vars.DIRECTUS_DB_NAME || 'directus' }}
-      DIRECTUS_DB_USER:        ${{ secrets.DIRECTUS_DB_USER || vars.DIRECTUS_DB_USER || 'directus' }}
-      DIRECTUS_DB_PASSWORD:    ${{ (needs.prepare.outputs.target == 'testing' && secrets.TESTING_DIRECTUS_DB_PASSWORD) || (needs.prepare.outputs.target == 'staging' && secrets.STAGING_DIRECTUS_DB_PASSWORD) || secrets.DIRECTUS_DB_PASSWORD || vars.DIRECTUS_DB_PASSWORD || 'directus' }}
+      POSTGRES_DB:             ${{ secrets.POSTGRES_DB || vars.POSTGRES_DB || 'payload' }}
+      POSTGRES_USER:           ${{ secrets.POSTGRES_USER || vars.POSTGRES_USER || 'postgres' }}
+      POSTGRES_PASSWORD:       ${{ (needs.prepare.outputs.target == 'testing' && secrets.TESTING_POSTGRES_PASSWORD) || (needs.prepare.outputs.target == 'staging' && secrets.STAGING_POSTGRES_PASSWORD) || secrets.POSTGRES_PASSWORD || vars.POSTGRES_PASSWORD || 'postgres' }}
 
       
       # Secrets mapping (Mail)
@@ -285,11 +285,11 @@ jobs:
           LOG_LEVEL=$LOG_LEVEL
           
           # Database & Payload
-          DATABASE_URI=\${DATABASE_URI:-postgresql://$DIRECTUS_DB_USER:$DIRECTUS_DB_PASSWORD@mb-grid-db:5432/$DIRECTUS_DB_NAME}
+          DATABASE_URI=\${DATABASE_URI:-postgresql://$POSTGRES_USER:$POSTGRES_PASSWORD@mb-grid-db:5432/$POSTGRES_DB}
           PAYLOAD_SECRET=${PAYLOAD_SECRET:-you-need-to-set-a-payload-secret}
-          DIRECTUS_DB_NAME=$DIRECTUS_DB_NAME
-          DIRECTUS_DB_USER=$DIRECTUS_DB_USER
-          DIRECTUS_DB_PASSWORD=$DIRECTUS_DB_PASSWORD
+          POSTGRES_DB=$POSTGRES_DB
+          POSTGRES_USER=$POSTGRES_USER
+          POSTGRES_PASSWORD=$POSTGRES_PASSWORD
           
           # Mail
           MAIL_HOST=$MAIL_HOST

docker-compose.override.yml

@@ -8,7 +8,7 @@ services:
       - .:/app
     environment:
       NODE_ENV: development
-      DATABASE_URI: postgresql://directus:directus@mb-grid-db:5432/directus
+      DATABASE_URI: postgresql://postgres:postgres@mb-grid-db:5432/payload
       # Build / dependency installation
       NPM_TOKEN: ${NPM_TOKEN}
       CI: 'true'

docker-compose.yaml

@@ -89,9 +89,9 @@ services:
     env_file:
       - ${ENV_FILE:-.env}
     environment:
-      POSTGRES_DB: ${DIRECTUS_DB_NAME:-directus}
-      POSTGRES_USER: ${DIRECTUS_DB_USER:-directus}
-      POSTGRES_PASSWORD: ${DIRECTUS_DB_PASSWORD:-directus}
+      POSTGRES_DB: ${POSTGRES_DB:-payload}
+      POSTGRES_USER: ${POSTGRES_USER:-postgres}
+      POSTGRES_PASSWORD: ${POSTGRES_PASSWORD:-postgres}
     volumes:
       - mb-grid-db-data:/var/lib/postgresql/data
 

docs/PLATFORM.md

@@ -20,7 +20,7 @@ CI (Woodpecker)
 https://ci.infra.mintel.me  
 
 Container Registry  
-https://registry.infra.mintel.me  
+https://git.infra.mintel.me  
 
 Errors (GlitchTip)  
 https://errors.infra.mintel.me  
@@ -76,13 +76,13 @@ This directory contains:
 All production images must be built by CI and pushed to the Mintel Registry.
 
 Registry:
-registry.infra.mintel.me
+git.infra.mintel.me
 
 Image naming:
-registry.infra.mintel.me/ORG/APP_NAME:TAG
+git.infra.mintel.me/mmintel/APP_NAME:TAG
 
 Example:
-registry.infra.mintel.me/mintel/mb-grid-solutions:latest
+git.infra.mintel.me/mmintel/mb-grid-solutions:latest
 
 ---
 
@@ -204,8 +204,8 @@ steps:
 build:
 image: woodpeckerci/plugin-docker
 settings:
-registry: registry.infra.mintel.me
-repo: registry.infra.mintel.me/mintel/mb-grid-solutions
+registry: git.infra.mintel.me
+repo: git.infra.mintel.me/mmintel/mb-grid-solutions
 username:
 from_secret: REGISTRY_USER
 password:

lib/env.ts

@@ -17,9 +17,6 @@ import {
 const envExtension = {
   // Project specific overrides or additions
   AUTH_COOKIE_NAME: z.string().default("mb_gatekeeper_session"),
-
-  INFRA_DIRECTUS_URL: z.string().url().optional(),
-  INFRA_DIRECTUS_TOKEN: z.string().optional(),
 };
 
 /**

middleware.ts

@@ -15,7 +15,7 @@ export const config = {
   // Matcher for all pages and internationalized pathnames
   // excluding api, _next, static files, etc.
   matcher: [
-    "/((?!api|stats|errors|_next|_vercel|.*\\..*).*)",
+    "/((?!api|admin|stats|errors|_next|_vercel|.*\\..*).*)",
     "/",
     "/(de)/:path*",
   ],

src/payload/payload.config.ts

@@ -13,6 +13,8 @@ import { Media } from "./collections/Media";
 import { FormSubmissions } from "./collections/FormSubmissions";
 import { Pages } from "./collections/Pages";
 
+import { migrations } from "../../migrations/index";
+
 const filename = fileURLToPath(import.meta.url);
 const dirname = path.dirname(filename);
 
@@ -44,8 +46,9 @@ export default buildConfig({
       connectionString:
         process.env.DATABASE_URI ||
         process.env.POSTGRES_URI ||
-        `postgresql://${process.env.DIRECTUS_DB_USER || "directus"}:${process.env.DIRECTUS_DB_PASSWORD || "directus"}@127.0.0.1:5432/${process.env.DIRECTUS_DB_NAME || "directus"}`,
+        `postgresql://${process.env.POSTGRES_USER || "postgres"}:${process.env.POSTGRES_PASSWORD || "postgres"}@127.0.0.1:5432/${process.env.POSTGRES_DB || "payload"}`,
     },
+    prodMigrations: migrations,
   }),
   ...(process.env.SMTP_HOST
     ? {