From ac17655c9de68e48f6b1d6730026cbeda3dbb8e0 Mon Sep 17 00:00:00 2001 From: Justin Schneck Date: Tue, 9 Jul 2019 16:36:51 -0400 Subject: [PATCH] Lets see it --- apps/nerves_hub_api/config/release.exs | 8 ++++++++ apps/nerves_hub_device/config/release.exs | 6 ++++++ apps/nerves_hub_www/config/release.exs | 8 ++++++++ rel/env.sh.eex | 1 - rel/scripts/ecs-cluster.sh | 2 +- 5 files changed, 23 insertions(+), 2 deletions(-) diff --git a/apps/nerves_hub_api/config/release.exs b/apps/nerves_hub_api/config/release.exs index 990b90699..db99c9497 100644 --- a/apps/nerves_hub_api/config/release.exs +++ b/apps/nerves_hub_api/config/release.exs @@ -1,5 +1,13 @@ import Config +{sync_nodes_optional, _} = Code.eval_string(System.fetch_env!("SYNC_NODES_OPTIONAL")) + +config :kernel, + sync_nodes_optional: sync_nodes_optional, + sync_nodes_timeout: 5000, + inet_dist_listen_min: 9100, + inet_dist_listen_max: 9155 + config :rollbax, access_token: System.fetch_env!("ROLLBAR_ACCESS_TOKEN") config :nerves_hub_web_core, NervesHubWebCore.Firmwares.Upload.S3, diff --git a/apps/nerves_hub_device/config/release.exs b/apps/nerves_hub_device/config/release.exs index 990b90699..75ec85240 100644 --- a/apps/nerves_hub_device/config/release.exs +++ b/apps/nerves_hub_device/config/release.exs @@ -1,5 +1,11 @@ import Config +config :kernel, + sync_nodes_optional: System.fetch_env!("SYNC_NODES_OPTIONAL"), + sync_nodes_timeout: 5000, + inet_dist_listen_min: 9100, + inet_dist_listen_max: 9155 + config :rollbax, access_token: System.fetch_env!("ROLLBAR_ACCESS_TOKEN") config :nerves_hub_web_core, NervesHubWebCore.Firmwares.Upload.S3, diff --git a/apps/nerves_hub_www/config/release.exs b/apps/nerves_hub_www/config/release.exs index eaf4827d4..2039fd22d 100644 --- a/apps/nerves_hub_www/config/release.exs +++ b/apps/nerves_hub_www/config/release.exs @@ -1,5 +1,13 @@ import Config +{sync_nodes_optional, _} = Code.eval_string(System.fetch_env!("SYNC_NODES_OPTIONAL")) + +config :kernel, + sync_nodes_optional: sync_nodes_optional, + sync_nodes_timeout: 5000, + inet_dist_listen_min: 9100, + inet_dist_listen_max: 9155 + config :rollbax, access_token: System.fetch_env!("ROLLBAR_ACCESS_TOKEN") config :nerves_hub_web_core, NervesHubWebCore.Firmwares.Upload.S3, diff --git a/rel/env.sh.eex b/rel/env.sh.eex index f896a8f5b..25f6e5bc0 100644 --- a/rel/env.sh.eex +++ b/rel/env.sh.eex @@ -17,4 +17,3 @@ export RELEASE_COOKIE=${ERL_COOKIE} export RELEASE_DISTRIBUTION=name export RELEASE_NODE=<%= @release.name %>@${LOCAL_IPV4} -export ELIXIR_ERL_OPTIONS="-kernel inet_dist_listen_min 9100 inet_dist_listen_max 9155 sync_nodes_timeout 5000 sync_nodes_optional '${SYNC_NODES_OPTIONAL}'" diff --git a/rel/scripts/ecs-cluster.sh b/rel/scripts/ecs-cluster.sh index a54867fe1..080750294 100755 --- a/rel/scripts/ecs-cluster.sh +++ b/rel/scripts/ecs-cluster.sh @@ -14,7 +14,7 @@ service_ip_addresses() { } format_nodes() { - for IP in $1; do echo "'$2@$IP'"; done + for IP in $1; do echo ":\"$2@$IP\""; done } METADATA=`curl http://169.254.170.2/v2/metadata`