Change hostpath so that we can serve the site from its final urls

greenpeace · Feb 15, 2019 · e43ec18 · e43ec18
1 parent 9a9cb27
commit e43ec18
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/.circleci/artifacts.yml b/.circleci/artifacts.yml
@@ -1,11 +1,11 @@
 job_environments:
   common_environment: &common_environment
     CONTAINER_PREFIX: planet4-storytelling
-    APP_HOSTPATH: storytelling
+    APP_HOSTPATH:
     WP_DB_NAME_PREFIX: planet4-storytel_wordpress
   develop_environment: &develop_environment
     APP_ENVIRONMENT: development
-    APP_HOSTNAME: k8s.p4.greenpeace.org
+    APP_HOSTNAME: develop.storytelling.greenpeace.org
     CLOUDSQL_INSTANCE: p4-develop-k8s
     GOOGLE_PROJECT_ID: planet-4-151612
     GCLOUD_CLUSTER: p4-development
@@ -16,7 +16,7 @@ job_environments:
     WP_STATELESS_BUCKET: planet4-storytelling-stateless-develop
   release_environment: &release_environment
     APP_ENVIRONMENT: staging
-    APP_HOSTNAME: release.k8s.p4.greenpeace.org
+    APP_HOSTNAME: release.storytelling.greenpeace.org
     CLOUDSQL_INSTANCE: planet4-prod
     GCLOUD_CLUSTER: planet4-production
     GOOGLE_PROJECT_ID: planet4-production
@@ -26,7 +26,7 @@ job_environments:
     WP_DB_NAME: planet4-storytel_wordpress_release
     WP_STATELESS_BUCKET: planet4-storytelling-stateless-release
   production_environment: &production_environment
-    APP_HOSTNAME: master.k8s.p4.greenpeace.org
+    APP_HOSTNAME: storytelling.greenpeace.org
     CLOUDSQL_INSTANCE: planet4-prod
     GCLOUD_CLUSTER: planet4-production
     GOOGLE_PROJECT_ID: planet4-production

diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -7,11 +7,11 @@ defaults: &defaults
 job_environments:
   common_environment: &common_environment
     CONTAINER_PREFIX: planet4-storytelling
-    APP_HOSTPATH: storytelling
+    APP_HOSTPATH:
     WP_DB_NAME_PREFIX: planet4-storytel_wordpress
   develop_environment: &develop_environment
     APP_ENVIRONMENT: development
-    APP_HOSTNAME: k8s.p4.greenpeace.org
+    APP_HOSTNAME: develop.storytelling.greenpeace.org
     CLOUDSQL_INSTANCE: p4-develop-k8s
     GOOGLE_PROJECT_ID: planet-4-151612
     GCLOUD_CLUSTER: p4-development
@@ -22,7 +22,7 @@ job_environments:
     WP_STATELESS_BUCKET: planet4-storytelling-stateless-develop
   release_environment: &release_environment
     APP_ENVIRONMENT: staging
-    APP_HOSTNAME: release.k8s.p4.greenpeace.org
+    APP_HOSTNAME: release.storytelling.greenpeace.org
     CLOUDSQL_INSTANCE: planet4-prod
     GCLOUD_CLUSTER: planet4-production
     GOOGLE_PROJECT_ID: planet4-production
@@ -32,7 +32,7 @@ job_environments:
     WP_DB_NAME: planet4-storytel_wordpress_release
     WP_STATELESS_BUCKET: planet4-storytelling-stateless-release
   production_environment: &production_environment
-    APP_HOSTNAME: master.k8s.p4.greenpeace.org
+    APP_HOSTNAME: storytelling.greenpeace.org
     CLOUDSQL_INSTANCE: planet4-prod
     GCLOUD_CLUSTER: planet4-production
     GOOGLE_PROJECT_ID: planet4-production