From dbc572a8ef17ff6797c73b71c4610180bc4ea603 Mon Sep 17 00:00:00 2001 From: Andrew Dryga Date: Wed, 9 Aug 2023 01:22:56 -0500 Subject: [PATCH] Remove legacy config env keys --- .../domain/lib/domain/config/definitions.ex | 20 +++++-------------- 1 file changed, 5 insertions(+), 15 deletions(-) diff --git a/elixir/apps/domain/lib/domain/config/definitions.ex b/elixir/apps/domain/lib/domain/config/definitions.ex index 60302ae6e..c19e56f6a 100644 --- a/elixir/apps/domain/lib/domain/config/definitions.ex +++ b/elixir/apps/domain/lib/domain/config/definitions.ex @@ -139,10 +139,7 @@ defmodule Domain.Config.Definitions do @doc """ Enable or disable requiring secure cookies. Required for HTTPS. """ - defconfig(:phoenix_secure_cookies, :boolean, - default: true, - legacy_keys: [{:env, "SECURE_COOKIES", "0.9"}] - ) + defconfig(:phoenix_secure_cookies, :boolean, default: true) defconfig(:phoenix_listen_address, Types.IP, default: "0.0.0.0") @@ -194,8 +191,7 @@ defmodule Domain.Config.Definitions do from a list of possible source IPs. """ defconfig(:phoenix_external_trusted_proxies, {:json_array, {:one_of, [Types.IP, Types.CIDR]}}, - default: [], - legacy_keys: [{:env, "EXTERNAL_TRUSTED_PROXIES", "0.9"}] + default: [] ) @doc """ @@ -206,8 +202,7 @@ defmodule Domain.Config.Definitions do from a list of possible source IPs. """ defconfig(:phoenix_private_clients, {:json_array, {:one_of, [Types.IP, Types.CIDR]}}, - default: [], - legacy_keys: [{:env, "PRIVATE_CLIENTS", "0.9"}] + default: [] ) ############################################## @@ -243,8 +238,7 @@ defmodule Domain.Config.Definitions do Size of the connection pool to the PostgreSQL database. """ defconfig(:database_pool_size, :integer, - default: fn -> :erlang.system_info(:logical_processors_available) * 2 end, - legacy_keys: [{:env, "DATABASE_POOL", "0.9"}] + default: fn -> :erlang.system_info(:logical_processors_available) * 2 end ) @doc """ @@ -253,10 +247,7 @@ defmodule Domain.Config.Definitions do If this field is set to `true`, the `database_ssl_opts` config must be set too with at least `cacertfile` option present. """ - defconfig(:database_ssl_enabled, :boolean, - default: false, - legacy_keys: [{:env, "DATABASE_SSL", "0.9"}] - ) + defconfig(:database_ssl_enabled, :boolean, default: false) @doc """ SSL options for connecting to the PostgreSQL database. @@ -546,7 +537,6 @@ defmodule Domain.Config.Definitions do # TODO: validate opts are present if adapter is not NOOP one default: %{}, sensitive: true, - legacy_keys: [{:env, "OUTBOUND_EMAIL_CONFIGS", "0.9"}], dump: &Dumper.keyword/1 )