update configs

Norwik · Aug 15, 2023 · e4ef2e6 · e4ef2e6
1 parent a1d7315
commit e4ef2e6
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 11 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -38,20 +38,12 @@ jobs:
 
       - name: Get dependencies
         run: make deps
-        env:
-          DB_SSL: off
 
       - name: Check gorilla format
         run: make fmt_check
-        env:
-          DB_SSL: off
 
       - name: Test gorilla
         run: make ci
-        env:
-          DB_SSL: off
 
       - name: Build gorilla
         run: make build
-        env:
-          DB_SSL: off
diff --git a/Dockerfile b/Dockerfile
diff --git a/config/dev.exs b/config/dev.exs
@@ -5,7 +5,7 @@
 import Config
 
 # Configure your database
-if System.get_env("DB_SSL") == "on" do
+if System.get_env("DB_SSL") || "off" == "on" do
   config :gorilla, Gorilla.Repo,
     username: System.get_env("DB_USERNAME") || "gorilla",
     password: System.get_env("DB_PASSWORD") || "gorilla",

diff --git a/config/runtime.exs b/config/runtime.exs
@@ -27,7 +27,7 @@ end
 if config_env() == :prod do
   maybe_ipv6 = if System.get_env("ECTO_IPV6"), do: [:inet6], else: []
 
-  if System.get_env("DB_SSL") == "on" do
+  if System.get_env("DB_SSL") || "off" == "on" do
     config :gorilla, Gorilla.Repo,
       username: System.get_env("DB_USERNAME"),
       password: System.get_env("DB_PASSWORD"),
@@ -40,7 +40,7 @@ if config_env() == :prod do
       ssl: true,
       ssl_opts: [
         verify: :verify_peer,
-        cacertfile: System.get_env("DB_CA_CERTFILE_PATH")
+        cacertfile: System.get_env("DB_CA_CERTFILE_PATH") || ""
       ]
   else
     config :gorilla, Gorilla.Repo,