diff options
Diffstat (limited to 'config')
| -rw-r--r-- | config/config.exs | 3 | ||||
| -rw-r--r-- | config/test.exs | 9 |
2 files changed, 11 insertions, 1 deletions
diff --git a/config/config.exs b/config/config.exs index b0f4578d5..d3f9cf6e4 100644 --- a/config/config.exs +++ b/config/config.exs @@ -53,7 +53,8 @@ config :pleroma, :instance, upload_limit: 16_000_000, registrations_open: true, federating: true, - rewrite_policy: Pleroma.Web.ActivityPub.MRF.NoOpPolicy + rewrite_policy: Pleroma.Web.ActivityPub.MRF.NoOpPolicy, + public: true config :pleroma, :mrf_simple, media_removal: [], diff --git a/config/test.exs b/config/test.exs index e0461e93d..0c73f892a 100644 --- a/config/test.exs +++ b/config/test.exs @@ -26,3 +26,12 @@ config :comeonin, :pbkdf2_rounds, 1 config :pleroma, :websub, Pleroma.Web.WebsubMock config :pleroma, :ostatus, Pleroma.Web.OStatusMock config :pleroma, :httpoison, HTTPoisonMock + +try do + import_config "test.secret.exs" +rescue + _ -> + IO.puts( + "You may want to create test.secret.exs to declare custom database connection parameters." + ) +end |