fix(force_ssl): Configure force_ssl in prod instead of runtime (#2035)

* fix(force_ssl): Configure force_ssl in prod instead of runtime

* Removed unless check

* Moved config to test

config/deps/phoenix.exs

@@ -33,12 +33,3 @@ else
   # and calculating stacktraces is usually expensive.
   config :phoenix, :stacktrace_depth, 20
 end
-
-if config_env() == :test do
-  # Let test requests get routed through the :secure pipeline
-  config :dotcom, :secure_pipeline,
-    force_ssl: [
-      host: nil,
-      rewrite_on: [:x_forwarded_proto]
-    ]
-end

config/prod.exs

@@ -2,3 +2,11 @@ import Config
 
 config :dotcom, :cache, Dotcom.Cache.Multilevel
 config :dotcom, :trip_plan_feedback_cache, Dotcom.Cache.TripPlanFeedback.Cache
+
+# configured separately so that we can have the health check not require
+# SSL
+config :dotcom, :secure_pipeline,
+  force_ssl: [
+    host: nil,
+    rewrite_on: [:x_forwarded_proto]
+  ]

config/runtime.exs

@@ -175,16 +175,6 @@ if config_env() == :prod do
       port: System.get_env("STATIC_PORT")
     ]
 
-  unless System.get_env("PORT") do
-    # configured separately so that we can have the health check not require
-    # SSL
-    config :dotcom, :secure_pipeline,
-      force_ssl: [
-        host: nil,
-        rewrite_on: [:x_forwarded_proto]
-      ]
-  end
-
   config :dotcom,
     support_ticket_to_email: System.get_env("SUPPORT_TICKET_TO_EMAIL"),
     support_ticket_from_email: System.get_env("SUPPORT_TICKET_FROM_EMAIL"),

config/test.exs

@@ -15,3 +15,10 @@ config :dotcom, :redix_pub_sub, Dotcom.Redix.PubSub.Mock
 config :dotcom, :req_module, Req.Mock
 
 config :dotcom, :trip_plan_feedback_cache, Dotcom.Cache.TestCache
+
+# Let test requests get routed through the :secure pipeline
+config :dotcom, :secure_pipeline,
+  force_ssl: [
+    host: nil,
+    rewrite_on: [:x_forwarded_proto]
+  ]