Skip to content

Commit

Permalink
Merge pull request #646 from alphagov/revert-643-ris-centralise_alb_l…
Browse files Browse the repository at this point in the history
…ogs

Revert "load balancers: write logs to global bucket"
  • Loading branch information
risicle committed Aug 29, 2023
2 parents 4e4d1c3 + 0207b36 commit 6238d3c
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 16 deletions.
7 changes: 0 additions & 7 deletions terraform/bosh/lb.tf
Original file line number Diff line number Diff line change
Expand Up @@ -40,13 +40,6 @@ resource "aws_lb" "bosh" {
tags = {
Name = "${var.env}-bosh-lb"
}

access_logs {
bucket = data.aws_s3_bucket.account_wide_alb_access_logs.id
prefix = "${var.env}/bosh"
enabled = true
}

}

resource "aws_lb_listener" "bosh_tls" {
Expand Down
6 changes: 1 addition & 5 deletions terraform/concourse/elb.tf
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,6 @@ resource "aws_elb" "concourse" {
lb_protocol = "ssl"
ssl_certificate_id = aws_acm_certificate_validation.system.certificate_arn
}
access_logs {
bucket = data.aws_s3_bucket.account_wide_alb_access_logs.bucket
bucket_prefix = "${var.env}/concourse"
enabled = true
}

tags = {
Name = "${var.env}-concourse-elb"
Expand Down Expand Up @@ -118,3 +113,4 @@ resource "aws_route53_record" "concourse" {
ttl = "60"
records = [aws_elb.concourse.dns_name]
}

4 changes: 0 additions & 4 deletions terraform/globals.tf
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,3 @@ variable "user_static_cidrs" {
description = "user static cidrs populated with values from paas-trusted-people"
default = []
}

data "aws_s3_bucket" "account_wide_alb_access_logs" {
bucket = "gds-paas-${var.aws_account}-account-wide-alb-access-logs"
}

0 comments on commit 6238d3c

Please sign in to comment.