Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion infra/deployments/forms/forms-admin/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ module "forms_admin" {
enable_opentelemetry = var.forms_admin_settings.enable_opentelemetry
opentelemetry_head_sampler_ratio = var.forms_runner_settings.opentelemetry_head_sampler_ratio
act_as_user_enabled = var.forms_admin_settings.act_as_user_enabled
welsh_enabled = var.forms_admin_settings.welsh_enabled
org_admin_alerts_enabled = var.forms_admin_settings.org_admin_alerts_enabled
enable_mailchimp_sync = var.forms_admin_settings.synchronize_to_mailchimp
enable_organisations_sync = var.forms_admin_settings.synchronize_orgs_from_govuk
Expand Down
1 change: 0 additions & 1 deletion infra/deployments/forms/inputs.tf
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,6 @@ variable "forms_admin_settings" {
enable_opentelemetry = optional(bool, false)
opentelemetry_head_sampler_ratio = string
act_as_user_enabled = bool
welsh_enabled = bool
org_admin_alerts_enabled = bool
govuk_app_domain = string
synchronize_to_mailchimp = bool
Expand Down
1 change: 0 additions & 1 deletion infra/deployments/forms/tfvars/dev.tfvars
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,6 @@ forms_admin_settings = {
enable_opentelemetry = true
opentelemetry_head_sampler_ratio = "0.1"
act_as_user_enabled = true
welsh_enabled = true
org_admin_alerts_enabled = true
govuk_app_domain = "integration.publishing.service.gov.uk"
synchronize_to_mailchimp = false
Expand Down
1 change: 0 additions & 1 deletion infra/deployments/forms/tfvars/production.tfvars
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,6 @@ forms_admin_settings = {
enable_opentelemetry = true
opentelemetry_head_sampler_ratio = "0.1"
act_as_user_enabled = false
welsh_enabled = true
org_admin_alerts_enabled = true
govuk_app_domain = "publishing.service.gov.uk"
synchronize_to_mailchimp = true
Expand Down
1 change: 0 additions & 1 deletion infra/deployments/forms/tfvars/staging.tfvars
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@ forms_admin_settings = {
enable_opentelemetry = false
opentelemetry_head_sampler_ratio = "0.1"
act_as_user_enabled = true
welsh_enabled = true
org_admin_alerts_enabled = true
govuk_app_domain = "staging.publishing.service.gov.uk"
synchronize_to_mailchimp = false
Expand Down
1 change: 0 additions & 1 deletion infra/deployments/forms/tfvars/user-research.tfvars
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@ forms_admin_settings = {
enable_opentelemetry = false
opentelemetry_head_sampler_ratio = "0.1"
act_as_user_enabled = false
welsh_enabled = true
org_admin_alerts_enabled = true
govuk_app_domain = ""
synchronize_to_mailchimp = false
Expand Down
4 changes: 0 additions & 4 deletions infra/modules/forms-admin/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -158,10 +158,6 @@ module "ecs_service" {
name = "SETTINGS__ACT_AS_USER_ENABLED",
value = var.act_as_user_enabled
},
{
name = "SETTINGS__FEATURES__WELSH",
value = var.welsh_enabled
},
{
name = "SETTINGS__FEATURES__ORG_ADMIN_ALERTS_ENABLED",
value = var.org_admin_alerts_enabled
Expand Down
6 changes: 0 additions & 6 deletions infra/modules/forms-admin/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -90,12 +90,6 @@ variable "act_as_user_enabled" {
default = false
}

variable "welsh_enabled" {
type = bool
description = "Enables the Welsh forms feature for all groups"
default = false
}

variable "org_admin_alerts_enabled" {
type = bool
description = "Enables sending alerts to Org Admins about forms they control"
Expand Down
Loading