Skip to content

Commit 57908bf

Browse files
author
Steven Nemetz
committed
Reset to use modules from Terraform registry and update versions
1 parent d805e85 commit 57908bf

File tree

2 files changed

+25
-23
lines changed

2 files changed

+25
-23
lines changed

main.tf

Lines changed: 10 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -17,29 +17,20 @@
1717
# Multiple LBs ?
1818

1919
module "enable_logging" {
20-
#source = "devops-workflow/boolean/local"
21-
#version = "0.1.0"
22-
#source = "git::https://github.com/WisePricer/terraform-local-boolean.git?ref=tags/v0.1.1"
23-
source = "git::https://github.com/WisePricer/terraform-local-boolean.git"
24-
25-
value = "${var.enable_logging}"
20+
source = "devops-workflow/boolean/local"
21+
version = "0.1.1"
22+
value = "${var.enable_logging}"
2623
}
2724

2825
module "enabled" {
29-
#source = "devops-workflow/boolean/local"
30-
#version = "0.1.0"
31-
#source = "git::https://github.com/WisePricer/terraform-local-boolean.git?ref=tags/v0.1.1"
32-
source = "git::https://github.com/WisePricer/terraform-local-boolean.git"
33-
34-
value = "${var.enabled}"
26+
source = "devops-workflow/boolean/local"
27+
version = "0.1.1"
28+
value = "${var.enabled}"
3529
}
3630

3731
module "label" {
38-
#source = "devops-workflow/label/local"
39-
#version = "0.1.2"
40-
#source = "git::https://github.com/WisePricer/terraform-local-label.git?ref=tags/v0.1.3"
41-
source = "git::https://github.com/WisePricer/terraform-local-label.git"
42-
32+
source = "devops-workflow/label/local"
33+
version = "0.1.3"
4334
organization = "${var.organization}"
4435
name = "${var.name}"
4536
namespace-env = "${var.namespace-env}"
@@ -53,11 +44,8 @@ module "label" {
5344
# TODO: need to support from var both basename and a complete name
5445
# may have 1 log bucket for many apps
5546
module "log_bucket" {
56-
#source = "devops-workflow/label/local"
57-
#version = "0.1.2"
58-
#source = "git::https://github.com/WisePricer/terraform-local-label.git?ref=tags/v0.1.3"
59-
source = "git::https://github.com/WisePricer/terraform-local-label.git"
60-
47+
source = "devops-workflow/label/local"
48+
version = "0.1.3"
6149
organization = "${var.organization}"
6250
name = "${var.log_bucket_name}"
6351
namespace-env = true
@@ -435,4 +423,3 @@ resource "aws_lb_listener_rule" "this" {
435423
}
436424
}
437425
*/
438-

variables.tf

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,21 @@ variable "certificate_name" {
6666
//
6767
// Load Balancer settings
6868
//
69+
variable "enable_cross_zone_load_balancing" {
70+
description = "Enable cross-zone load balancing on NLB"
71+
default = false
72+
}
73+
74+
variable "enable_deletion_protection" {
75+
description = "Enable deletion protection. Prevent LB from being deleted"
76+
default = false
77+
}
78+
79+
variable "enable_http2" {
80+
description = "Enable HTTP/2 on ALB"
81+
default = true
82+
}
83+
6984
variable "idle_timeout" {
7085
description = "The time in seconds that the connection is allowed to be idle"
7186
default = "60"

0 commit comments

Comments
 (0)