diff options
| author | Egor Kislitsyn <egor@kislitsyn.com> | 2019-10-21 14:19:15 +0700 |
|---|---|---|
| committer | Egor Kislitsyn <egor@kislitsyn.com> | 2019-10-21 14:19:15 +0700 |
| commit | 4ea1a61b008c932bc83fcd6cd07bb7f4c251204a (patch) | |
| tree | c763bd3a2a21ee3e40384ee323076bbb577b7ccb /config/config.exs | |
| parent | 8ad015ef64e0d2a4cd9f2979ff08d28be3a635e5 (diff) | |
| parent | 62e3d76a450c1b34ba8d0c88a184ec861ed90f29 (diff) | |
| download | pleroma-4ea1a61b008c932bc83fcd6cd07bb7f4c251204a.tar.gz pleroma-4ea1a61b008c932bc83fcd6cd07bb7f4c251204a.zip | |
Merge branch 'develop' into refactor/following-relationships
Diffstat (limited to 'config/config.exs')
| -rw-r--r-- | config/config.exs | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/config/config.exs b/config/config.exs index f4d92102f..a69d41d17 100644 --- a/config/config.exs +++ b/config/config.exs @@ -59,10 +59,6 @@ scheduled_jobs = _ -> [] end -scheduled_jobs = - scheduled_jobs ++ - [{"0 */6 * * * *", {Pleroma.Web.Websub, :refresh_subscriptions, []}}] - config :pleroma, Pleroma.Scheduler, global: true, overlap: true, @@ -243,9 +239,7 @@ config :pleroma, :instance, federation_incoming_replies_max_depth: 100, federation_reachability_timeout_days: 7, federation_publisher_modules: [ - Pleroma.Web.ActivityPub.Publisher, - Pleroma.Web.Websub, - Pleroma.Web.Salmon + Pleroma.Web.ActivityPub.Publisher ], allow_relay: true, rewrite_policy: Pleroma.Web.ActivityPub.MRF.NoOpPolicy, @@ -328,6 +322,16 @@ config :pleroma, :assets, ], default_mascot: :pleroma_fox_tan +config :pleroma, :manifest, + icons: [ + %{ + src: "/static/logo.png", + type: "image/png" + } + ], + theme_color: "#282c37", + background_color: "#191b22" + config :pleroma, :activitypub, unfollow_blocked: true, outgoing_blocks: true, |