Lets see it

nerves-hub · Jul 9, 2019 · ace2131 · ace2131
1 parent 274e093
commit ace2131
Show file tree

Hide file tree

Showing 5 changed files with 46 additions and 2 deletions.
diff --git a/apps/nerves_hub_api/config/release.exs b/apps/nerves_hub_api/config/release.exs
@@ -1,5 +1,20 @@
 import Config
 
+sync_nodes_optional =
+  case System.fetch_env("SYNC_NODES_OPTIONAL") do
+    {:ok, sync_nodes_optional} ->
+      {sync_nodes_optional, _} = Code.eval_string(sync_nodes_optional)
+
+    :error ->
+      []
+  end
+
+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
@@ -1,5 +1,20 @@
 import Config
 
+sync_nodes_optional =
+  case System.fetch_env("SYNC_NODES_OPTIONAL") do
+    {:ok, sync_nodes_optional} ->
+      {sync_nodes_optional, _} = Code.eval_string(sync_nodes_optional)
+
+    :error ->
+      []
+  end
+
+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_www/config/release.exs b/apps/nerves_hub_www/config/release.exs
@@ -1,5 +1,20 @@
 import Config
 
+sync_nodes_optional =
+  case System.fetch_env("SYNC_NODES_OPTIONAL") do
+    {:ok, sync_nodes_optional} ->
+      {sync_nodes_optional, _} = Code.eval_string(sync_nodes_optional)
+
+    :error ->
+      []
+  end
+
+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
@@ -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
@@ -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`