From af01058b827c8477122dd41c1c8d65f5140a4d48 Mon Sep 17 00:00:00 2001 From: Laurenz Honauer Date: Fri, 15 Nov 2024 14:01:58 +0100 Subject: [PATCH 1/3] feat: allow db cert specification --- config/runtime.exs | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/config/runtime.exs b/config/runtime.exs index 4c40efa..58dd1cc 100644 --- a/config/runtime.exs +++ b/config/runtime.exs @@ -53,6 +53,12 @@ if config_env() == :prod do config :turbo, Turbo.Repo, ssl: use_db_ssl, + ssl_opts: [ + verify: :verify_peer, + cacertfile: System.get_env("DATABASE_CA_CERT"), + verify_fun: &:ssl_verify_hostname.verify_fun/3, + server_name_indication: String.to_charlist(System.get_env("DATABASE_HOST", "")), + ], url: database_url, pool_size: String.to_integer(System.get_env("POOL_SIZE") || "10"), socket_options: maybe_ipv6 From 56a77d79b9a33b3de3bc95d3065fdbcb648e9db7 Mon Sep 17 00:00:00 2001 From: Laurenz Honauer Date: Tue, 3 Dec 2024 12:21:06 +0100 Subject: [PATCH 2/3] Update config/runtime.exs Co-authored-by: Bruno Paulino --- config/runtime.exs | 19 +++++++++++++------ docker-compose.prod.yml | 1 - 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/config/runtime.exs b/config/runtime.exs index 58dd1cc..1b8ff16 100644 --- a/config/runtime.exs +++ b/config/runtime.exs @@ -51,14 +51,21 @@ if config_env() == :prod do maybe_ipv6 = if System.get_env("ECTO_IPV6"), do: [:inet6], else: [] use_db_ssl = System.get_env("USE_DB_SSL") == "1" + db_ssl_opts = + if System.get_env("DATABASE_CA_CERT") do + [ + verify: :verify_peer, + cacertfile: System.get_env("DATABASE_CA_CERT"), + verify_fun: &:ssl_verify_hostname.verify_fun/3, + server_name_indication: String.to_charlist(System.get_env("DATABASE_HOST", "")) + ] + else + [] + end + config :turbo, Turbo.Repo, ssl: use_db_ssl, - ssl_opts: [ - verify: :verify_peer, - cacertfile: System.get_env("DATABASE_CA_CERT"), - verify_fun: &:ssl_verify_hostname.verify_fun/3, - server_name_indication: String.to_charlist(System.get_env("DATABASE_HOST", "")), - ], + ssl_opts: db_ssl_opts, url: database_url, pool_size: String.to_integer(System.get_env("POOL_SIZE") || "10"), socket_options: maybe_ipv6 diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml index 267eba3..93061c8 100644 --- a/docker-compose.prod.yml +++ b/docker-compose.prod.yml @@ -33,7 +33,6 @@ services: - "4000:4000" volumes: - ./docker_turbo_artifacts:/var/turbo_artifacts - turbo_racer_db: image: postgres:14.2 container_name: turbo_racer_db From d70adb87ef794cf5377caf8501e38cd9a1ad38ef Mon Sep 17 00:00:00 2001 From: Bruno Paulino Date: Tue, 3 Dec 2024 08:37:30 -0300 Subject: [PATCH 3/3] Bump app version to 1.6.0 --- mix.exs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mix.exs b/mix.exs index c2d3025..0eae08f 100644 --- a/mix.exs +++ b/mix.exs @@ -5,7 +5,7 @@ defmodule Turbo.MixProject do [ app: :turbo, name: "Turbo Racer", - version: "1.5.1", + version: "1.6.0", elixir: "~> 1.15", elixirc_paths: elixirc_paths(Mix.env()), compilers: Mix.compilers(),