From 460efcd873118a0e37f9c01445fed6d79e901337 Mon Sep 17 00:00:00 2001 From: martintomas Date: Tue, 5 Dec 2023 17:21:32 +0100 Subject: [PATCH] refactoring: Reverting impact-sphere url subdirectory --- infrastructure/base/main.tf | 10 +++++----- infrastructure/base/modules/app/main.tf | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/infrastructure/base/main.tf b/infrastructure/base/main.tf index dcb0468..d4d5401 100644 --- a/infrastructure/base/main.tf +++ b/infrastructure/base/main.tf @@ -40,8 +40,8 @@ locals { ADMIN_JWT_SECRET = random_password.admin_jwt_secret.result TRANSFER_TOKEN_SALT = random_password.transfer_token_salt.result JWT_SECRET = random_password.jwt_secret.result - CMS_URL = "${module.staging.app_url}/impact-sphere/cms" - STRAPI_ADMIN_API_BASE_URL = "${module.staging.app_url}/impact-sphere/cms/api" + CMS_URL = "${module.staging.app_url}/cms" + STRAPI_ADMIN_API_BASE_URL = "${module.staging.app_url}/cms/api" STRAPI_ADMIN_MAPBOX_ACCESS_TOKEN = var.mapbox_api_token STRAPI_MEDIA_LIBRARY_PROVIDER = "digitalocean" @@ -64,10 +64,10 @@ locals { } staging_client_env = { - NEXT_PUBLIC_URL = "${module.staging.app_url}/impact-sphere" - NEXT_PUBLIC_BASE_PATH = "/impact-sphere" + NEXT_PUBLIC_URL = module.staging.app_url + NEXT_PUBLIC_BASE_PATH = "" NEXT_PUBLIC_ENVIRONMENT = "production" - NEXT_PUBLIC_API_URL = "${module.staging.app_url}/impact-sphere/cms/api" + NEXT_PUBLIC_API_URL = "${module.staging.app_url}/cms/api" NEXT_PUBLIC_GA_TRACKING_ID = var.ga_tracking_id NEXT_PUBLIC_MAPBOX_API_TOKEN = var.mapbox_api_token LOG_LEVEL = "info" diff --git a/infrastructure/base/modules/app/main.tf b/infrastructure/base/modules/app/main.tf index 98ef6ec..522ac70 100644 --- a/infrastructure/base/modules/app/main.tf +++ b/infrastructure/base/modules/app/main.tf @@ -43,7 +43,7 @@ resource "digitalocean_app" "app" { } routes { - path = "/impact-sphere" + path = "/" preserve_path_prefix = false } } @@ -68,7 +68,7 @@ resource "digitalocean_app" "app" { } routes { - path = "/impact-sphere/cms" + path = "/cms" preserve_path_prefix = false } }