merge: updates from upstream

Conflicts:
    .gitignore
    lib/wabanex/application.ex
    mix.lock

lib/wabanex/application.ex

@@ -1,35 +1,26 @@
 defmodule Wabanex.Application do
-  # See https://hexdocs.pm/elixir/Application.html
-  # for more information on OTP Applications
   @moduledoc false
 
   use Application
 
   def start(_type, _args) do
     children = [
-      # Start the PromEx supervisor
       Wabanex.PromEx,
-      # Start the Ecto repository
       Wabanex.Repo,
-      # Start the Telemetry supervisor
       WabanexWeb.Telemetry,
-      # Start the PubSub system
       {Phoenix.PubSub, name: Wabanex.PubSub},
-      # Start the Endpoint (http/https)
-      WabanexWeb.Endpoint,
-      # Start a worker by calling: Wabanex.Worker.start_link(arg)
-      # {Wabanex.Worker, arg}
-      {Growth.Indicators.Load, []}
+      {Growth.Indicators.Load, []},
+      {DNSCluster,
+       query: Application.get_env(:wabanex, :dns_cluster_query) || :ignore,
+       log: :info,
+       resolver: Application.get_env(:wabanex, :dns_cluster_resolver) || DNSCluster.Resolver},
+      WabanexWeb.Endpoint
     ]
 
-    # See https://hexdocs.pm/elixir/Supervisor.html
-    # for other strategies and supported options
     opts = [strategy: :one_for_one, name: Wabanex.Supervisor]
     Supervisor.start_link(children, opts)
   end
 
-  # Tell Phoenix to update the endpoint configuration
-  # whenever the application is updated.
   def config_change(changed, _new, removed) do
     WabanexWeb.Endpoint.config_change(changed, removed)
     :ok