diff options
| author | Rin Toshaka <rinpatch@sdf.org> | 2018-12-05 14:16:55 +0100 |
|---|---|---|
| committer | Rin Toshaka <rinpatch@sdf.org> | 2018-12-05 14:16:55 +0100 |
| commit | 9938fa3293478e0dfe5f8d82c1526e0cd3747cf1 (patch) | |
| tree | ff6497bc68b1588cf3b54cc6b9e9135ef69a17d1 /config | |
| parent | 6396f1b58f69b727e801df4b52a32c47da08e517 (diff) | |
| parent | 22eff1791204864d0536e71c13649d0030c409a7 (diff) | |
| download | pleroma-9938fa3293478e0dfe5f8d82c1526e0cd3747cf1.tar.gz pleroma-9938fa3293478e0dfe5f8d82c1526e0cd3747cf1.zip | |
Merge develop to refactor/mix-tasks
Diffstat (limited to 'config')
| -rw-r--r-- | config/config.exs | 1 | ||||
| -rw-r--r-- | config/dev.exs | 11 | ||||
| -rw-r--r-- | config/test.exs | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/config/config.exs b/config/config.exs index 12f47389c..8d2fdd40d 100644 --- a/config/config.exs +++ b/config/config.exs @@ -72,6 +72,7 @@ config :mime, :types, %{ config :pleroma, :websub, Pleroma.Web.Websub config :pleroma, :ostatus, Pleroma.Web.OStatus config :pleroma, :httpoison, Pleroma.HTTP +config :tesla, adapter: Tesla.Adapter.Hackney # Configures http settings, upstream proxy etc. config :pleroma, :http, proxy_url: nil diff --git a/config/dev.exs b/config/dev.exs index 7b06ad67e..166be721a 100644 --- a/config/dev.exs +++ b/config/dev.exs @@ -49,11 +49,10 @@ config :pleroma, Pleroma.Repo, hostname: "localhost", pool_size: 10 -try do +if File.exists?("./config/dev.secret.exs") do import_config "dev.secret.exs" -rescue - _ -> - IO.puts( - "!!! RUNNING IN LOCALHOST DEV MODE! !!!\nFEDERATION WON'T WORK UNTIL YOU CONFIGURE A dev.secret.exs" - ) +else + 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 3aaed1b2c..6f6227c20 100644 --- a/config/test.exs +++ b/config/test.exs @@ -25,7 +25,7 @@ config :pbkdf2_elixir, rounds: 1 config :pleroma, :websub, Pleroma.Web.WebsubMock config :pleroma, :ostatus, Pleroma.Web.OStatusMock -config :pleroma, :httpoison, HTTPoisonMock +config :tesla, adapter: Tesla.Mock try do import_config "test.secret.exs" |