diff options
| author | Roger Braun <roger@rogerbraun.net> | 2017-12-09 11:00:56 +0100 |
|---|---|---|
| committer | Roger Braun <roger@rogerbraun.net> | 2017-12-09 11:00:56 +0100 |
| commit | 30e9b22f96f2bf1cd895e993190f40afba159bb6 (patch) | |
| tree | 811c64694f98c10f55cdbaeb98ada50209b59580 /config | |
| parent | 6268b7e0eb400c1b5e227a73e6faee0f1e476db4 (diff) | |
| parent | d5a13c10ac6a9a5f8dbb1932ffc85260f079a2dc (diff) | |
| download | pleroma-30e9b22f96f2bf1cd895e993190f40afba159bb6.tar.gz pleroma-30e9b22f96f2bf1cd895e993190f40afba159bb6.zip | |
Merge branch 'develop' into feature/activitypub
Diffstat (limited to 'config')
| -rw-r--r-- | config/dev.exs | 2 | ||||
| -rw-r--r-- | config/test.exs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/config/dev.exs b/config/dev.exs index 126baea28..83326e6f2 100644 --- a/config/dev.exs +++ b/config/dev.exs @@ -49,5 +49,5 @@ config :pleroma, Pleroma.Repo, try do import_config "dev.secret.exs" rescue - _-> nil + _-> IO.puts("!!! RUNNING IN LOCALHOST DEV MODE! !!!\nFEDERATION WON'T WORK UNTIL YOU CONFIGURE A dev.secret.exs") end diff --git a/config/test.exs b/config/test.exs index 04136e1f2..26b5410fe 100644 --- a/config/test.exs +++ b/config/test.exs @@ -18,7 +18,7 @@ config :pleroma, Pleroma.Repo, username: "postgres", password: "postgres", database: "pleroma_test", - hostname: "localhost", + hostname: System.get_env("DB_HOST") || "localhost", pool: Ecto.Adapters.SQL.Sandbox |