Skip to content

Commit

Permalink
2.142.0
Browse files Browse the repository at this point in the history
  • Loading branch information
root committed May 31, 2024
1 parent 8a4469e commit 569d822
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 15 deletions.
17 changes: 9 additions & 8 deletions aws_v2/modules/networking/nlb.tf
Original file line number Diff line number Diff line change
Expand Up @@ -81,13 +81,14 @@ resource "aws_subnet" "subnet_public_b" {
}

resource "aws_lb" "load_balancer" {
count = var.public_deployment == true ? 0 : 1
name_prefix = "CadoLB"
internal = var.private_load_balancer
load_balancer_type = "application"
ip_address_type = "ipv4"
subnets = [local.subnet_a_id, local.subnet_b_id]
security_groups = [aws_security_group.alb_security_group[0].id]
count = var.public_deployment == true ? 0 : 1
name_prefix = "CadoLB"
internal = var.private_load_balancer
load_balancer_type = "application"
drop_invalid_header_fields = true
ip_address_type = "ipv4"
subnets = [local.subnet_a_id, local.subnet_b_id]
security_groups = [aws_security_group.alb_security_group[0].id]
tags = merge(
var.tags,
{
Expand Down Expand Up @@ -120,7 +121,7 @@ resource "aws_lb_listener" "load_balancer_listener" {
load_balancer_arn = aws_lb.load_balancer[0].arn
port = "443"
protocol = "HTTPS"
ssl_policy = "ELBSecurityPolicy-2016-08"
ssl_policy = "ELBSecurityPolicy-TLS13-1-2-2021-06"
certificate_arn = var.certificate_arn
default_action {
type = "forward"
Expand Down
8 changes: 1 addition & 7 deletions azure/azure_transient/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -307,12 +307,6 @@ resource "random_string" "cado" {
special = false
}

resource "azurerm_resource_group" "keyvault" {
name = "cado-kv-rg-${data.azurerm_resource_group.group.name}"
location = data.azurerm_resource_group.group.location
tags = var.tags
}

resource "azurerm_key_vault_access_policy" "bitbucket" {
key_vault_id = azurerm_key_vault.keyvault.id
tenant_id = data.azurerm_client_config.current.tenant_id
Expand Down Expand Up @@ -359,7 +353,7 @@ resource "azurerm_key_vault_access_policy" "cado" {

resource "azurerm_key_vault" "keyvault" {
name = "cado-${random_string.cado.result}"
location = azurerm_resource_group.keyvault.location
location = data.azurerm_resource_group.group.location
resource_group_name = data.azurerm_resource_group.group.name
enabled_for_disk_encryption = true
tenant_id = data.azurerm_client_config.current.tenant_id
Expand Down

0 comments on commit 569d822

Please sign in to comment.