Commit ebc9fb99 authored by Adrian Horrocks's avatar Adrian Horrocks

adding randomness to elb logs bucket name, set default logging to bucket as false

parent c6e1fe87
...@@ -68,7 +68,7 @@ variable "health_check_interval" { ...@@ -68,7 +68,7 @@ variable "health_check_interval" {
} }
variable "logs_enabled" { variable "logs_enabled" {
default = "true" default = "false"
} }
variable "logs_interval" { variable "logs_interval" {
...@@ -156,11 +156,17 @@ resource "aws_elb" "main" { ...@@ -156,11 +156,17 @@ resource "aws_elb" "main" {
############################################################################################################# #############################################################################################################
# S3 Bucket for Log Exports # S3 Bucket for Log Exports
############################################################################################################# #############################################################################################################
resource "random_string" "bucket_name" {
length = 8
special = false
upper = false
}
data "aws_elb_service_account" "main" {} data "aws_elb_service_account" "main" {}
resource "aws_s3_bucket" "elb_logs" { resource "aws_s3_bucket" "elb_logs" {
bucket = "${var.name}-elb-logs" count = "${var.logs_enabled == "true" ? 1 : 0}"
bucket = "${var.name}-${random_string.bucket_name.result}-elb-logs"
acl = "private" acl = "private"
policy = <<POLICY policy = <<POLICY
...@@ -173,7 +179,7 @@ resource "aws_s3_bucket" "elb_logs" { ...@@ -173,7 +179,7 @@ resource "aws_s3_bucket" "elb_logs" {
"s3:PutObject" "s3:PutObject"
], ],
"Effect": "Allow", "Effect": "Allow",
"Resource": "arn:aws:s3:::${var.name}-elb-logs/AWSLogs/*", "Resource": "arn:aws:s3:::${var.name}-${random_string.bucket_name.result}-elb-logs/AWSLogs/*",
"Principal": { "Principal": {
"AWS": [ "AWS": [
"${data.aws_elb_service_account.main.arn}" "${data.aws_elb_service_account.main.arn}"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment