diff options
| author | Ivan Tashkinov <ivantashkinov@gmail.com> | 2019-08-31 14:25:43 +0300 |
|---|---|---|
| committer | Ivan Tashkinov <ivantashkinov@gmail.com> | 2019-08-31 14:25:43 +0300 |
| commit | e890ea7e821d61fca75084d46f70ed125acf1fc8 (patch) | |
| tree | 7994c0be9f90b39a9ed46bbfd9f04fce70a14671 /docs/config.md | |
| parent | cd78e63a2528ab813088d5e44a026f6bb05b344b (diff) | |
| parent | 6d33c89c4d27a1b52e69e1c14b408726410a6326 (diff) | |
| download | pleroma-e890ea7e821d61fca75084d46f70ed125acf1fc8.tar.gz | |
[#1149] Added Oban job for "activity_expiration". Merged remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
# Conflicts:
# config/config.exs
Diffstat (limited to 'docs/config.md')
| -rw-r--r-- | docs/config.md | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/docs/config.md b/docs/config.md index 72e36db83..2e351e272 100644 --- a/docs/config.md +++ b/docs/config.md @@ -8,7 +8,7 @@ If you run Pleroma with ``MIX_ENV=prod`` the file is ``prod.secret.exs``, otherw * `filters`: List of `Pleroma.Upload.Filter` to use. * `link_name`: When enabled Pleroma will add a `name` parameter to the url of the upload, for example `https://instance.tld/media/corndog.png?name=corndog.png`. This is needed to provide the correct filename in Content-Disposition headers when using filters like `Pleroma.Upload.Filter.Dedupe` * `base_url`: The base URL to access a user-uploaded file. Useful when you want to proxy the media files via another host. -* `proxy_remote`: If you\'re using a remote uploader, Pleroma will proxy media requests instead of redirecting to it. +* `proxy_remote`: If you're using a remote uploader, Pleroma will proxy media requests instead of redirecting to it. * `proxy_opts`: Proxy options, see `Pleroma.ReverseProxy` documentation. Note: `strip_exif` has been replaced by `Pleroma.Upload.Filter.Mogrify`. @@ -497,6 +497,10 @@ config :auto_linker, * `total_user_limit`: the number of scheduled activities a user is allowed to create in total (Default: `300`) * `enabled`: whether scheduled activities are sent to the job queue to be executed +## Pleroma.ActivityExpiration + +# `enabled`: whether expired activities will be sent to the job queue to be deleted + ## Pleroma.Web.Auth.Authenticator * `Pleroma.Web.Auth.PleromaAuthenticator`: default database authenticator @@ -669,6 +673,8 @@ This will probably take a long time. ## :rate_limit +This is an advanced feature and disabled by default. + A keyword list of rate limiters where a key is a limiter name and value is the limiter configuration. The basic configuration is a tuple where: * The first element: `scale` (Integer). The time scale in milliseconds. |