potsda.mn/mobilizon
10
4
Fork 1
Code Issues 22 Pull requests 1 Projects Releases Wiki Activity

Merge branch 'feat-allow-database-port-configuration' into 'master'

Browse source 
Allow database port configuration for dev and test

See merge request framasoft/mobilizon!432
This commit is contained in:
Thomas Citharel 2020-06-03 12:36:30 +02:00
parent 1e493ccd28 cf6b3fbf31
commit 03d9e59492
2 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
config/dev.exs
View file

@ -69,7 +69,7 @@ config :mobilizon, Mobilizon.Storage.Repo,
password: System.get_env("MOBILIZON_DATABASE_PASSWORD", "mobilizon"), password: System.get_env("MOBILIZON_DATABASE_PASSWORD", "mobilizon"),
database: System.get_env("MOBILIZON_DATABASE_DBNAME", "mobilizon_dev"), database: System.get_env("MOBILIZON_DATABASE_DBNAME", "mobilizon_dev"),
hostname: System.get_env("MOBILIZON_DATABASE_HOST", "localhost"), hostname: System.get_env("MOBILIZON_DATABASE_HOST", "localhost"),
port: "5432", port: System.get_env("MOBILIZON_DATABASE_PORT", "5432"),
pool_size: 10, pool_size: 10,
show_sensitive_data_on_connection_error: true show_sensitive_data_on_connection_error: true

1
config/test.exs
View file

@ -32,6 +32,7 @@ config :mobilizon, Mobilizon.Storage.Repo,
password: System.get_env("MOBILIZON_DATABASE_PASSWORD") || "mobilizon", password: System.get_env("MOBILIZON_DATABASE_PASSWORD") || "mobilizon",
database: System.get_env("MOBILIZON_DATABASE_DBNAME") || "mobilizon_test", database: System.get_env("MOBILIZON_DATABASE_DBNAME") || "mobilizon_test",
hostname: System.get_env("MOBILIZON_DATABASE_HOST") || "localhost", hostname: System.get_env("MOBILIZON_DATABASE_HOST") || "localhost",
port: System.get_env("MOBILIZON_DATABASE_PORT") || "5432",
pool: Ecto.Adapters.SQL.Sandbox pool: Ecto.Adapters.SQL.Sandbox
config :mobilizon, Mobilizon.Web.Email.Mailer, adapter: Bamboo.TestAdapter config :mobilizon, Mobilizon.Web.Email.Mailer, adapter: Bamboo.TestAdapter