diff options
| author | Maxim Filippov <colixer@gmail.com> | 2019-10-18 18:35:58 +0200 |
|---|---|---|
| committer | Maxim Filippov <colixer@gmail.com> | 2019-10-18 18:35:58 +0200 |
| commit | 019147f1153f0df844997c04c31753c18a22509f (patch) | |
| tree | 4086ddbb3c92cd0439a973ec6f59bb2c0c758c4c /config | |
| parent | 2473702be22a44070fcff439ac901f5b9bb0586a (diff) | |
| parent | 4053a82f41691195d1b29cc9eb3f6ed6814ee12f (diff) | |
| download | pleroma-019147f1153f0df844997c04c31753c18a22509f.tar.gz pleroma-019147f1153f0df844997c04c31753c18a22509f.zip | |
Merge branch 'develop' into feature/relay-list
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 ] }, %{ |