@@ -115,33 +115,6 @@ module "redis_sentinel" {
115
115
network_private_subnet_cidrs = local. network_private_subnet_cidrs
116
116
}
117
117
118
- # -----------------------------------------------------------------------------
119
- # Redis Sentinel
120
- # -----------------------------------------------------------------------------
121
-
122
- module "redis_mtls" {
123
- count = var. enable_redis_mtls ? 1 : 0
124
- source = " ./modules/redis-standalone-mtls"
125
- # This module is used to deploy a Redis instance with mTLS enabled.
126
-
127
- domain_name = var. domain_name
128
- ca_cert = var. redis_client_ca
129
- fullchain = var. redis_client_cert
130
- privkey = var. redis_client_key
131
- redis_authentication_mode = " NONE" # mTLS does not use password authentication
132
- aws_iam_instance_profile = module. service_accounts . iam_instance_profile . name
133
- asg_tags = var. asg_tags
134
- ec2_launch_template_tag_specifications = var. ec2_launch_template_tag_specifications
135
- friendly_name_prefix = var. friendly_name_prefix
136
- health_check_grace_period = var. health_check_grace_period
137
- health_check_type = var. health_check_type
138
- instance_type = var. instance_type
139
- key_name = var. key_name
140
- network_id = local. network_id
141
- network_subnets_private = local. network_private_subnets
142
- network_private_subnet_cidrs = local. network_private_subnet_cidrs
143
- }
144
-
145
118
# -----------------------------------------------------------------------------
146
119
# AWS PostreSQL Database
147
120
# -----------------------------------------------------------------------------
@@ -197,7 +170,7 @@ module "aurora_database" {
197
170
# Docker Compose File Config for TFE on instance(s) using Flexible Deployment Options
198
171
# ------------------------------------------------------------------------------------
199
172
module "runtime_container_engine_config" {
200
- source = " git::https://github.com/hashicorp/terraform-random-tfe-utility//modules/runtime_container_engine_config?ref=redis-standalone "
173
+ source = " git::https://github.com/hashicorp/terraform-random-tfe-utility//modules/runtime_container_engine_config?ref=main "
201
174
count = var. is_replicated_deployment ? 0 : 1
202
175
203
176
tfe_license = var. hc_license
@@ -255,11 +228,6 @@ module "runtime_container_engine_config" {
255
228
redis_sentinel_leader_name = local. redis . sentinel_leader
256
229
redis_sentinel_user = local. redis . sentinel_username
257
230
redis_sentinel_password = local. redis . sentinel_password
258
- redis_use_mtls = var. enable_redis_mtls
259
- redis_ca_cert_path = " /etc/ssl/private/terraform-enterprise/redis/ca_cert.pem"
260
- redis_client_cert_path = " /etc/ssl/private/terraform-enterprise/redis/cert.pem"
261
- redis_client_key_path = " /etc/ssl/private/terraform-enterprise/redis/key.pem"
262
-
263
231
264
232
trusted_proxies = local. trusted_proxies
265
233
@@ -275,7 +243,7 @@ module "runtime_container_engine_config" {
275
243
# AWS cloud init used to install and configure TFE on instance(s) using Flexible Deployment Options
276
244
# --------------------------------------------------------------------------------------------------
277
245
module "tfe_init_fdo" {
278
- source = " git::https://github.com/hashicorp/terraform-random-tfe-utility//modules/tfe_init?ref=redis-standalone "
246
+ source = " git::https://github.com/hashicorp/terraform-random-tfe-utility//modules/tfe_init?ref=main "
279
247
count = var. is_replicated_deployment ? 0 : 1
280
248
281
249
cloud = " aws"
@@ -290,11 +258,6 @@ module "tfe_init_fdo" {
290
258
ca_certificate_secret_id = var. ca_certificate_secret_id == null ? null : var. ca_certificate_secret_id
291
259
certificate_secret_id = var. vm_certificate_secret_id == null ? null : var. vm_certificate_secret_id
292
260
key_secret_id = var. vm_key_secret_id == null ? null : var. vm_key_secret_id
293
-
294
- # redis_use_mtls = var.enable_redis_mtls
295
- # redis_ca_certificate_secret_id = var.redis_ca_certificate_secret_id == null ? null : var.redis_ca_certificate_secret_id
296
- # redis_certificate_secret_id = var.redis_vm_certificate_secret_id == null ? null : var.redis_vm_certificate_secret_id
297
- # redis_key_secret_id = var.redis_vm_key_secret_id == null ? null : var.redis_vm_key_secret_id
298
261
299
262
proxy_ip = var. proxy_ip != null ? var. proxy_ip : null
300
263
proxy_port = var. proxy_ip != null ? var. proxy_port : null
@@ -314,7 +277,7 @@ module "tfe_init_fdo" {
314
277
# TFE and Replicated settings to pass to the tfe_init_replicated module for replicated deployment
315
278
# --------------------------------------------------------------------------------------------
316
279
module "settings" {
317
- source = " git::https://github.com/hashicorp/terraform-random-tfe-utility//modules/settings?ref=redis-standalone "
280
+ source = " git::https://github.com/hashicorp/terraform-random-tfe-utility//modules/settings?ref=main "
318
281
count = var. is_replicated_deployment ? 1 : 0
319
282
320
283
# TFE Base Configuration
0 commit comments