diff options
Diffstat (limited to 'config')
| -rw-r--r-- | config/config.exs | 3 | ||||
| -rw-r--r-- | config/description.exs | 10 | ||||
| -rw-r--r-- | config/dev.exs | 1 |
3 files changed, 9 insertions, 5 deletions
diff --git a/config/config.exs b/config/config.exs index 2f8a18788..828fe0085 100644 --- a/config/config.exs +++ b/config/config.exs @@ -460,7 +460,7 @@ config :pleroma, :shout, enabled: true, limit: 5_000 -config :phoenix, :format_encoders, json: Jason +config :phoenix, :format_encoders, json: Jason, "activity+json": Jason config :phoenix, :json_library, Jason @@ -560,6 +560,7 @@ config :pleroma, Oban, mailer: 10, transmogrifier: 20, scheduled_activities: 10, + poll_notifications: 10, background: 5, remote_fetcher: 2, attachments_cleanup: 1, diff --git a/config/description.exs b/config/description.exs index 934a62a62..c72231faa 100644 --- a/config/description.exs +++ b/config/description.exs @@ -687,12 +687,14 @@ config :pleroma, :config_description, [ }, %{ key: :quarantined_instances, - type: {:list, :string}, + type: {:list, :tuple}, + key_placeholder: "instance", + value_placeholder: "reason", description: - "List of ActivityPub instances where private (DMs, followers-only) activities will not be sent", + "List of ActivityPub instances where private (DMs, followers-only) activities will not be sent and the reason for doing so", suggestions: [ - "quarantined.com", - "*.quarantined.com" + {"quarantined.com", "Reason"}, + {"*.quarantined.com", "Reason"} ] }, %{ diff --git a/config/dev.exs b/config/dev.exs index 6b7ffb0e9..ab3e83c12 100644 --- a/config/dev.exs +++ b/config/dev.exs @@ -62,6 +62,7 @@ if File.exists?("./config/dev.secret.exs") do import_config "dev.secret.exs" else IO.puts( + :stderr, "!!! RUNNING IN LOCALHOST DEV MODE! !!!\nFEDERATION WON'T WORK UNTIL YOU CONFIGURE A dev.secret.exs" ) end |