change the container definitions to listen on both 80 and 443

briskt · briskt · commit 2ba7ebf06507 · 2025-10-31T13:44:51.000+08:00
diff --git a/modules/040-id-broker/main.tf b/modules/040-id-broker/main.tf
@@ -174,7 +174,6 @@ locals {
     password_mfa_lifespan_extension            = var.password_mfa_lifespan_extension
     password_profile_url                       = var.password_profile_url
     password_reuse_limit                       = var.password_reuse_limit
-    port                                       = var.enable_tls ? "443" : "80"
     profile_review_interval                    = var.profile_review_interval
     run_task                                   = ""
     send_get_backup_codes_emails               = var.send_get_backup_codes_emails
diff --git a/modules/040-id-broker/task-definition.json.tftpl b/modules/040-id-broker/task-definition.json.tftpl
@@ -7,8 +7,11 @@
     "dnsSearchDomains": null,
     "portMappings": [
       {
-        "hostPort": 0,
-        "containerPort": ${port},
+        "containerPort": 80,
+        "protocol": "tcp"
+      },
+      {
+        "containerPort": 443,
         "protocol": "tcp"
       }
     ],
diff --git a/modules/050-pw-manager/main.tf b/modules/050-pw-manager/main.tf
@@ -106,7 +106,6 @@ locals {
     password_rule_maxlength             = var.password_rule_maxlength
     password_rule_minlength             = var.password_rule_minlength
     password_rule_minscore              = var.password_rule_minscore
-    port                                = var.enable_tls ? "443" : "80"
     recaptcha_secret_key                = var.recaptcha_secret
     recaptcha_site_key                  = var.recaptcha_key
     sentry_dsn                          = var.sentry_dsn
diff --git a/modules/050-pw-manager/task-definition-api.json.tftpl b/modules/050-pw-manager/task-definition-api.json.tftpl
@@ -8,8 +8,11 @@
     "dnsSearchDomains": null,
     "portMappings": [
       {
-        "hostPort": 0,
-        "containerPort": ${port},
+        "containerPort": 80,
+        "protocol": "tcp"
+      },
+      {
+        "containerPort": 443,
         "protocol": "tcp"
       }
     ],
diff --git a/modules/060-simplesamlphp/main.tf b/modules/060-simplesamlphp/main.tf
@@ -98,7 +98,6 @@ locals {
     mysql_password              = var.mysql_pass
     mysql_user                  = var.mysql_user
     parameter_store_path        = local.parameter_store_path
-    port                        = var.enable_tls ? "443" : "80"
     profile_url                 = var.profile_url
     recaptcha_key               = var.recaptcha_key
     recaptcha_secret            = var.recaptcha_secret
diff --git a/modules/060-simplesamlphp/task-definition.json.tftpl b/modules/060-simplesamlphp/task-definition.json.tftpl
@@ -8,8 +8,11 @@
     "dnsSearchDomains": null,
     "portMappings": [
       {
-        "hostPort": 0,
-        "containerPort": ${port},
+        "containerPort": 80,
+        "protocol": "tcp"
+      },
+      {
+        "containerPort": 443,
         "protocol": "tcp"
       }
     ],

Original file line number	Diff line number	Diff line change
`@@ -7,8 +7,11 @@`
`7`	`7`	`"dnsSearchDomains": null,`
`8`	`8`	`"portMappings": [`
`9`	`9`	`{`
`10`		`- "hostPort": 0,`
`11`		`- "containerPort": ${port},`
	`10`	`+ "containerPort": 80,`
	`11`	`+ "protocol": "tcp"`
	`12`	`+ },`
	`13`	`+ {`
	`14`	`+ "containerPort": 443,`
`12`	`15`	`"protocol": "tcp"`
`13`	`16`	`}`
`14`	`17`	`],`
Original file line number	Diff line number	Diff line change
`@@ -8,8 +8,11 @@`
`8`	`8`	`"dnsSearchDomains": null,`
`9`	`9`	`"portMappings": [`
`10`	`10`	`{`
`11`		`- "hostPort": 0,`
`12`		`- "containerPort": ${port},`
	`11`	`+ "containerPort": 80,`
	`12`	`+ "protocol": "tcp"`
	`13`	`+ },`
	`14`	`+ {`
	`15`	`+ "containerPort": 443,`
`13`	`16`	`"protocol": "tcp"`
`14`	`17`	`}`
`15`	`18`	`],`