Merge branch 'master' into add-notification-schemas

santiment · Oct 28, 2024 · 5cb2ee7 · 5cb2ee7
2 parents 6e2d13a + 5de479a
commit 5cb2ee7
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 13 deletions.
diff --git a/config/runtime.exs b/config/runtime.exs
@@ -1,18 +1,5 @@
 import Config
 
-if config_env() == :dev do
-  {ssl, ssl_opts} =
-    if System.get_env("DATABASE_URL") do
-      {true, [verify: :verify_none]}
-    else
-      {false, []}
-    end
-
-  config :sanbase, Sanbase.Repo,
-    ssl: ssl,
-    ssl_opts: ssl_opts
-end
-
 if config_env() in [:dev, :test] do
   # In order to properly work while developing locally,
   # load the .env file before doing the configuration

diff --git a/lib/sanbase/repo.ex b/lib/sanbase/repo.ex
@@ -15,6 +15,17 @@ defmodule Sanbase.Repo do
       |> Keyword.put(:pool_size, pool_size)
       |> Keyword.put(:url, System.get_env("DATABASE_URL"))
 
+    test_env? = Application.get_env(:sanbase, :env) == :test
+
+    opts =
+      if is_nil(System.get_env("DATABASE_URL")) or test_env? do
+        opts
+      else
+        opts
+        |> Keyword.put(:ssl, true)
+        |> Keyword.put(:ssl_opts, verify: :verify_none)
+      end
+
     {:ok, opts}
   end
 end