diff --git a/lib/mix/tasks/beacon.gen.proxy_endpoint.ex b/lib/mix/tasks/beacon.gen.proxy_endpoint.ex index 312254142..238f9f529 100644 --- a/lib/mix/tasks/beacon.gen.proxy_endpoint.ex +++ b/lib/mix/tasks/beacon.gen.proxy_endpoint.ex @@ -97,26 +97,26 @@ defmodule Mix.Tasks.Beacon.Gen.ProxyEndpoint do [proxy_endpoint_module_name, :live_view, :signing_salt], signing_salt ) - |> Igniter.Project.Config.configure( - "runtime.exs", + |> Igniter.Project.Config.configure_runtime_env( + :prod, otp_app, [proxy_endpoint_module_name, :check_origin], {:code, Sourceror.parse_string!("[]")} ) - |> Igniter.Project.Config.configure( - "runtime.exs", + |> Igniter.Project.Config.configure_runtime_env( + :prod, otp_app, [proxy_endpoint_module_name, :url], {:code, Sourceror.parse_string!("[port: 443, scheme: \"https\"]")} ) - |> Igniter.Project.Config.configure( - "runtime.exs", + |> Igniter.Project.Config.configure_runtime_env( + :prod, otp_app, [proxy_endpoint_module_name, :http], {:code, Sourceror.parse_string!("[ip: {0, 0, 0, 0, 0, 0, 0, 0}, port: port]")} ) - |> Igniter.Project.Config.configure( - "runtime.exs", + |> Igniter.Project.Config.configure_runtime_env( + :prod, otp_app, [proxy_endpoint_module_name, :secret_key_base], {:code, Sourceror.parse_string!("secret_key_base")} diff --git a/lib/mix/tasks/beacon.gen.site.ex b/lib/mix/tasks/beacon.gen.site.ex index ee7ad4141..95c6497e3 100644 --- a/lib/mix/tasks/beacon.gen.site.ex +++ b/lib/mix/tasks/beacon.gen.site.ex @@ -346,19 +346,24 @@ defmodule Mix.Tasks.Beacon.Gen.Site do """)} ) # runtime.exs - |> Igniter.Project.Config.configure("runtime.exs", otp_app, [new_endpoint, :url, :host], host) - |> Igniter.Project.Config.configure("runtime.exs", otp_app, [new_endpoint, :url, :port], 443) - |> Igniter.Project.Config.configure("runtime.exs", otp_app, [new_endpoint, :url, :scheme], "https") - |> Igniter.Project.Config.configure( - "runtime.exs", + |> Igniter.Project.Config.configure_runtime_env(:prod, otp_app, [new_endpoint, :url, :host], host) + |> Igniter.Project.Config.configure_runtime_env(:prod, otp_app, [new_endpoint, :url, :port], 443) + |> Igniter.Project.Config.configure_runtime_env(:prod, otp_app, [new_endpoint, :url, :scheme], "https") + |> Igniter.Project.Config.configure_runtime_env( + :prod, otp_app, [new_endpoint, :http, :ip], {:code, Sourceror.parse_string!("{0, 0, 0, 0, 0, 0, 0, 0}")} ) - |> Igniter.Project.Config.configure("runtime.exs", otp_app, [new_endpoint, :http, :port], {:code, Sourceror.parse_string!("port")}) - |> Igniter.Project.Config.configure("runtime.exs", otp_app, [new_endpoint, :secret_key_base], {:code, Sourceror.parse_string!("secret_key_base")}) - |> Igniter.Project.Config.configure( - "runtime.exs", + |> Igniter.Project.Config.configure_runtime_env(:prod, otp_app, [new_endpoint, :http, :port], {:code, Sourceror.parse_string!("port")}) + |> Igniter.Project.Config.configure_runtime_env( + :prod, + otp_app, + [new_endpoint, :secret_key_base], + {:code, Sourceror.parse_string!("secret_key_base")} + ) + |> Igniter.Project.Config.configure_runtime_env( + :prod, otp_app, [proxy_endpoint, :check_origin], [], diff --git a/test/mix/tasks/gen_proxy_endpoint.exs b/test/mix/tasks/gen_proxy_endpoint.exs index e4884da67..fdc05bea9 100644 --- a/test/mix/tasks/gen_proxy_endpoint.exs +++ b/test/mix/tasks/gen_proxy_endpoint.exs @@ -72,12 +72,12 @@ defmodule Mix.Tasks.Beacon.GenProxyEndpointTest do project |> Igniter.compose_task("beacon.gen.proxy_endpoint", signing_salt: "SNUXnTNM") |> assert_has_patch("config/runtime.exs", """ - 3 + |config :test, TestWeb.ProxyEndpoint, - 4 + | check_origin: [], - 5 + | url: [port: 443, scheme: "https"], - 6 + | http: [ip: {0, 0, 0, 0, 0, 0, 0, 0}, port: port], - 7 + | secret_key_base: secret_key_base - 8 + | + 53 + |config :test, TestWeb.ProxyEndpoint, + 54 + | check_origin: [], + 55 + | url: [port: 443, scheme: "https"], + 56 + | http: [ip: {0, 0, 0, 0, 0, 0, 0, 0}, port: port], + 57 + | secret_key_base: secret_key_base + 58 + | """) end end diff --git a/test/mix/tasks/gen_site_test.exs b/test/mix/tasks/gen_site_test.exs index 53c63205a..83faffd02 100644 --- a/test/mix/tasks/gen_site_test.exs +++ b/test/mix/tasks/gen_site_test.exs @@ -243,11 +243,11 @@ defmodule Mix.Tasks.Beacon.GenSiteTest do project |> Igniter.compose_task("beacon.gen.site", @opts_my_site ++ ~w(--host example.com)) |> assert_has_patch("config/runtime.exs", """ - 3 + |config :test, TestWeb.ExampleEndpoint, - 4 + | url: [host: "example.com", port: 443, scheme: "https"], - 5 + | http: [ip: {0, 0, 0, 0, 0, 0, 0, 0}, port: port], - 6 + | secret_key_base: secret_key_base - 7 + | + 60 + |config :test, TestWeb.ExampleEndpoint, + 61 + | url: [host: "example.com", port: 443, scheme: "https"], + 62 + | http: [ip: {0, 0, 0, 0, 0, 0, 0, 0}, port: port], + 63 + | secret_key_base: secret_key_base + 64 + | """) |> assert_has_patch("config/runtime.exs", """ 8 + |config :test, TestWeb.ProxyEndpoint, check_origin: ["example.com"]