diff options
| author | marcin mikołajczak <git@mkljczk.pl> | 2024-03-08 12:12:55 +0100 |
|---|---|---|
| committer | marcin mikołajczak <git@mkljczk.pl> | 2024-03-08 12:12:55 +0100 |
| commit | c0c4a9ed0d3cd154de15a8bb0767e2d4e5f4900f (patch) | |
| tree | 0641fb03061bd783a15d06633408da4aa7592e76 /config/description.exs | |
| parent | 9fc6676d8c080dbd630434275363cc6536a35116 (diff) | |
| parent | 139057f346f5903e0ed21ea91e7d43fd906fe914 (diff) | |
| download | pleroma-c0c4a9ed0d3cd154de15a8bb0767e2d4e5f4900f.tar.gz pleroma-c0c4a9ed0d3cd154de15a8bb0767e2d4e5f4900f.zip | |
Merge remote-tracking branch 'origin/develop' into instance-contact-account
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
Diffstat (limited to 'config/description.exs')
| -rw-r--r-- | config/description.exs | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/config/description.exs b/config/description.exs index 1ca7f5b05..7a9c027de 100644 --- a/config/description.exs +++ b/config/description.exs @@ -567,6 +567,14 @@ config :pleroma, :config_description, [ ] }, %{ + key: :status_page, + type: :string, + description: "A page where people can see the status of the server during an outage", + suggestions: [ + "https://status.pleroma.example.org" + ] + }, + %{ key: :contact_username, type: :string, description: "Instance owner username", @@ -1450,7 +1458,7 @@ config :pleroma, :config_description, [ label: "Subject line behavior", type: :string, description: "Allows changing the default behaviour of subject lines in replies. - `email`: copy and preprend re:, as in email, + `email`: copy and prepend re:, as in email, `masto`: copy verbatim, as in Mastodon, `noop`: don't copy the subject.", suggestions: ["email", "masto", "noop"] @@ -3102,7 +3110,7 @@ config :pleroma, :config_description, [ key: :max_waiting, type: :integer, description: - "Maximum number of requests waiting for other requests to finish. After this number is reached, the pool will start returning errrors when a new request is made", + "Maximum number of requests waiting for other requests to finish. After this number is reached, the pool will start returning errors when a new request is made", suggestions: [10] }, %{ @@ -3368,7 +3376,7 @@ config :pleroma, :config_description, [ %{ key: :purge_after_days, type: :integer, - description: "Remove backup achives after N days", + description: "Remove backup archives after N days", suggestions: [30] }, %{ |