diff options
| author | feld <feld@feld.me> | 2022-11-11 17:38:51 +0000 |
|---|---|---|
| committer | feld <feld@feld.me> | 2022-11-11 17:38:51 +0000 |
| commit | ceb07772d06be3fb0e8590eed9963cfc29284866 (patch) | |
| tree | 03a0de011da6be9ecee941150d03b16442d71c0c /config | |
| parent | 39a96876ef1dd232c725cc10dccdc4f1e154a8fc (diff) | |
| parent | e7c40c250998bd7d90b7a8be39a8d8e85686153d (diff) | |
| download | pleroma-ceb07772d06be3fb0e8590eed9963cfc29284866.tar.gz pleroma-ceb07772d06be3fb0e8590eed9963cfc29284866.zip | |
Merge branch 'custom-db-port' into 'develop'
allow custom db port
Closes #2981
See merge request pleroma/pleroma!3775
Diffstat (limited to 'config')
| -rw-r--r-- | config/benchmark.exs | 1 | ||||
| -rw-r--r-- | config/docker.exs | 1 | ||||
| -rw-r--r-- | config/test.exs | 1 |
3 files changed, 3 insertions, 0 deletions
diff --git a/config/benchmark.exs b/config/benchmark.exs index 9a7ea5669..870ead150 100644 --- a/config/benchmark.exs +++ b/config/benchmark.exs @@ -40,6 +40,7 @@ config :pleroma, Pleroma.Repo, password: "postgres", database: "pleroma_benchmark", hostname: System.get_env("DB_HOST") || "localhost", + port: System.get_env("DB_PORT") || "5432", pool_size: 10 # Reduce hash rounds for testing diff --git a/config/docker.exs b/config/docker.exs index f9f27d141..5db222485 100644 --- a/config/docker.exs +++ b/config/docker.exs @@ -18,6 +18,7 @@ config :pleroma, Pleroma.Repo, password: System.fetch_env!("DB_PASS"), database: System.get_env("DB_NAME", "pleroma"), hostname: System.get_env("DB_HOST", "db"), + port: System.get_env("DB_PORT", "5432"), pool_size: 10 # Configure web push notifications diff --git a/config/test.exs b/config/test.exs index f5eb6e5c2..ea6f61393 100644 --- a/config/test.exs +++ b/config/test.exs @@ -47,6 +47,7 @@ config :pleroma, Pleroma.Repo, password: "postgres", database: "pleroma_test", hostname: System.get_env("DB_HOST") || "localhost", + port: System.get_env("DB_PORT") || "5432", pool: Ecto.Adapters.SQL.Sandbox, pool_size: 50 |