From c75423bacb4180d7e1fb84763ce349755caa0907 Mon Sep 17 00:00:00 2001 From: Toni Tertsonen Date: Fri, 16 Aug 2024 12:59:32 +0000 Subject: [PATCH] feat: add URL for laskugeneraattori --- main.tf | 1 + modules/web/main.tf | 17 +++++++++-------- modules/web/variables.tf | 3 +++ 3 files changed, 13 insertions(+), 8 deletions(-) diff --git a/main.tf b/main.tf index 65d7cf2..6123c9f 100644 --- a/main.tf +++ b/main.tf @@ -159,6 +159,7 @@ module "web" { google_oauth_client_id = module.keyvault.secrets["google-oauth-client-id"] google_oauth_client_secret = module.keyvault.secrets["google-oauth-client-secret"] public_ilmo_url = "https://${module.ilmo.fqdn}" + public_laskugeneraattori_url = "https://laskutus.tietokilta.fi" public_legacy_url = "https://tietokilta.fi" digitransit_subscription_key = module.keyvault.secrets["digitransit-subscription-key"] } diff --git a/modules/web/main.tf b/modules/web/main.tf index 2b6e03c..ca1d611 100644 --- a/modules/web/main.tf +++ b/modules/web/main.tf @@ -59,14 +59,15 @@ resource "azurerm_linux_web_app" "web" { } https_only = true app_settings = { - NODE_ENVIRONMENT = "production" - PUBLIC_ILMOMASIINA_URL = var.public_ilmo_url - WEBSITES_PORT = 3000 - PORT = 3000 - NEXT_REVALIDATION_KEY = random_password.revalidation_key.result - PUBLIC_SERVER_URL = "https://${azurerm_linux_web_app.cms.default_hostname}" - PUBLIC_LEGACY_URL = var.public_legacy_url - DIGITRANSIT_SUBSCRIPTION_KEY = var.digitransit_subscription_key + NODE_ENVIRONMENT = "production" + PUBLIC_ILMOMASIINA_URL = var.public_ilmo_url + NEXT_PUBLIC_LASKUGENERAATTORI_URL = var.public_laskugeneraattori_url + WEBSITES_PORT = 3000 + PORT = 3000 + NEXT_REVALIDATION_KEY = random_password.revalidation_key.result + PUBLIC_SERVER_URL = "https://${azurerm_linux_web_app.cms.default_hostname}" + PUBLIC_LEGACY_URL = var.public_legacy_url + DIGITRANSIT_SUBSCRIPTION_KEY = var.digitransit_subscription_key } } resource "random_password" "payload_secret" { diff --git a/modules/web/variables.tf b/modules/web/variables.tf index 3116ee8..94c2e37 100644 --- a/modules/web/variables.tf +++ b/modules/web/variables.tf @@ -43,7 +43,10 @@ variable "google_oauth_client_secret" { variable "public_ilmo_url" { type = string +} +variable "public_laskugeneraattori_url" { + type = string } variable "public_legacy_url" {