diff options
| author | kaniini <ariadne@dereferenced.org> | 2019-10-18 16:04:57 +0000 |
|---|---|---|
| committer | kaniini <ariadne@dereferenced.org> | 2019-10-18 16:04:57 +0000 |
| commit | 4053a82f41691195d1b29cc9eb3f6ed6814ee12f (patch) | |
| tree | 31075bdd659c45b688e3b670acc5c9b41a7abc63 /config | |
| parent | 223c0c0136be81a363b114538948e8e0317540af (diff) | |
| parent | c2ae6310dc09e65515c7b8774d2b85b5ef7da1a1 (diff) | |
| download | pleroma-4053a82f41691195d1b29cc9eb3f6ed6814ee12f.tar.gz pleroma-4053a82f41691195d1b29cc9eb3f6ed6814ee12f.zip | |
Merge branch 'feature/ostatus-removal' into 'develop'
ostatus removal
Closes #1145
See merge request pleroma/pleroma!1854
Diffstat (limited to 'config')
| -rw-r--r-- | config/config.exs | 8 | ||||
| -rw-r--r-- | config/description.exs | 4 |
2 files changed, 2 insertions, 10 deletions
diff --git a/config/config.exs b/config/config.exs index f4d92102f..d0766a6e2 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, diff --git a/config/description.exs b/config/description.exs index b007cf69c..571c64bc1 100644 --- a/config/description.exs +++ b/config/description.exs @@ -581,9 +581,7 @@ config :pleroma, :config_description, [ type: [:list, :module], description: "List of modules for federation publishing", suggestions: [ - Pleroma.Web.ActivityPub.Publisher, - Pleroma.Web.Websub, - Pleroma.Web.Salmo + Pleroma.Web.ActivityPub.Publisher ] }, %{ |