Merge branch 'fix-preview' into dev

# Conflicts: # apps/preview/.lagoon.env
AmazeeLabs · Jun 26, 2024 · 5f91a3c · 5f91a3c
2 parents 40710dc + 92912b5
commit 5f91a3c
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 13 deletions.
diff --git a/INIT.md b/INIT.md
@@ -66,7 +66,11 @@ replace(
   process.env.PROJECT_NAME_MACHINE,
 );
 replace(
-  ['apps/cms/.lagoon.env', 'apps/website/.lagoon.env'],
+  [
+    'apps/cms/.lagoon.env',
+    'apps/website/.lagoon.env',
+    'apps/preview/.lagoon.env',
+  ],
   'PROJECT_NAME=example',
   'PROJECT_NAME=' + process.env.PROJECT_NAME_MACHINE,
 );

diff --git a/apps/cms/.lagoon.env b/apps/cms/.lagoon.env
@@ -1,3 +1,4 @@
+PROJECT_NAME=example
 PUBLISHER_URL="https://build.${LAGOON_ENVIRONMENT}.${LAGOON_PROJECT}.ch4.amazee.io"
 NETLIFY_URL="https://build.${LAGOON_ENVIRONMENT}.${LAGOON_PROJECT}.ch4.amazee.io"
 PREVIEW_URL="https://preview.${LAGOON_ENVIRONMENT}.${LAGOON_PROJECT}.ch4.amazee.io"

diff --git a/apps/cms/.lagoon.env.dev b/apps/cms/.lagoon.env.dev
@@ -0,0 +1,3 @@
+PUBLISHER_URL="https://${LAGOON_GIT_BRANCH}-${PROJECT_NAME}.build.amazeelabs.dev"
+NETLIFY_URL="https://${LAGOON_GIT_BRANCH}-${PROJECT_NAME}.amazeelabs.dev"
+PREVIEW_URL="https://${LAGOON_GIT_BRANCH}-${PROJECT_NAME}.preview.amazeelabs.dev"
diff --git a/apps/cms/.lagoon.env.prod b/apps/cms/.lagoon.env.prod
@@ -1,7 +1,3 @@
-PROJECT_NAME=example
-PUBLISHER_URL="https://example.build.amazeelabs.dev"
-NETLIFY_URL="https://example.amazeelabs.dev"
-PREVIEW_URL="https://example.preview.amazeelabs.dev"
-
-# Used to set the original client secret.
-PUBLISHER_OAUTH2_CLIENT_SECRET=REPLACE_ME
+PUBLISHER_URL="https://${PROJECT_NAME}.build.amazeelabs.dev"
+NETLIFY_URL="https://${PROJECT_NAME}.amazeelabs.dev"
+PREVIEW_URL="https://${PROJECT_NAME}.preview.amazeelabs.dev"
diff --git a/apps/cms/.lagoon.env.stage b/apps/cms/.lagoon.env.stage
@@ -1,7 +1,3 @@
-PROJECT_NAME=example
 PUBLISHER_URL="https://${LAGOON_GIT_BRANCH}-${PROJECT_NAME}.build.amazeelabs.dev"
 NETLIFY_URL="https://${LAGOON_GIT_BRANCH}-${PROJECT_NAME}.amazeelabs.dev"
 PREVIEW_URL="https://${LAGOON_GIT_BRANCH}-${PROJECT_NAME}.preview.amazeelabs.dev"
-
-# Used to set the original client secret.
-PUBLISHER_OAUTH2_CLIENT_SECRET=REPLACE_ME
diff --git a/apps/preview/.lagoon.env b/apps/preview/.lagoon.env
@@ -1,2 +1,2 @@
-PROJECT_NAME="example"
+PROJECT_NAME=example
 DRUPAL_URL="https://nginx.${LAGOON_ENVIRONMENT}.${LAGOON_PROJECT}.ch4.amazee.io"