Merge pull request #320 from sil-org/both-ports

change the container definitions to listen on both 80 and 443

Author: briskt

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

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"
       }
     ],

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

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"
       }
     ],

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

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"
       }
     ],