diff options
Diffstat (limited to 'config')
| -rw-r--r-- | config/description.exs | 133 | ||||
| -rw-r--r-- | config/test.exs | 4 |
2 files changed, 63 insertions, 74 deletions
diff --git a/config/description.exs b/config/description.exs index bb1f43305..1628fb9e0 100644 --- a/config/description.exs +++ b/config/description.exs @@ -1062,65 +1062,63 @@ config :pleroma, :config_description, [ description: "Where logs will be sent, :console - send logs to stdout, { ExSyslogger, :ex_syslogger } - to syslog, Quack.Logger - to Slack.", suggestions: [:console, {ExSyslogger, :ex_syslogger}, Quack.Logger] - } - ] - }, - %{ - group: :logger, - type: :group, - key: :ex_syslogger, - label: "ExSyslogger", - description: "ExSyslogger-related settings", - children: [ - %{ - key: :level, - type: {:dropdown, :atom}, - description: "Log level", - suggestions: [:debug, :info, :warn, :error] - }, - %{ - key: :ident, - type: :string, - description: - "A string that's prepended to every message, and is typically set to the app name", - suggestions: ["pleroma"] - }, - %{ - key: :format, - type: :string, - description: "Default: \"$date $time [$level] $levelpad$node $metadata $message\"", - suggestions: ["$metadata[$level] $message"] - }, - %{ - key: :metadata, - type: {:list, :atom}, - suggestions: [:request_id] - } - ] - }, - %{ - group: :logger, - type: :group, - key: :console, - label: "Console Logger", - description: "Console logger settings", - children: [ - %{ - key: :level, - type: {:dropdown, :atom}, - description: "Log level", - suggestions: [:debug, :info, :warn, :error] }, %{ - key: :format, - type: :string, - description: "Default: \"$date $time [$level] $levelpad$node $metadata $message\"", - suggestions: ["$metadata[$level] $message"] + key: :ex_syslogger, + type: :keyword, + label: "ExSyslogger", + description: "ExSyslogger-related settings", + children: [ + %{ + key: :level, + type: {:dropdown, :atom}, + description: "Log level", + suggestions: [:debug, :info, :warn, :error] + }, + %{ + key: :ident, + type: :string, + description: + "A string that's prepended to every message, and is typically set to the app name", + suggestions: ["pleroma"] + }, + %{ + key: :format, + type: :string, + description: "Default: \"$date $time [$level] $levelpad$node $metadata $message\"", + suggestions: ["$metadata[$level] $message"] + }, + %{ + key: :metadata, + type: {:list, :atom}, + suggestions: [:request_id] + } + ] }, %{ - key: :metadata, - type: {:list, :atom}, - suggestions: [:request_id] + key: :console, + type: :keyword, + label: "Console Logger", + description: "Console logger settings", + children: [ + %{ + key: :level, + type: {:dropdown, :atom}, + description: "Log level", + suggestions: [:debug, :info, :warn, :error] + }, + %{ + key: :format, + type: :string, + description: "Default: \"$date $time [$level] $levelpad$node $metadata $message\"", + suggestions: ["$metadata[$level] $message"] + }, + %{ + key: :metadata, + type: {:list, :atom}, + suggestions: [:request_id] + } + ] } ] }, @@ -1840,19 +1838,13 @@ config :pleroma, :config_description, [ }, %{ group: :pleroma, + key: :admin_token, label: "Pleroma Admin Token", - type: :group, + type: :string, description: "Allows setting a token that can be used to authenticate requests with admin privileges without a normal user account token. Append the `admin_token` parameter to requests to utilize it. (Please reconsider using HTTP Basic Auth or OAuth-based authentication if possible)", - children: [ - %{ - key: :admin_token, - type: :string, - description: "Admin token", - suggestions: [ - "Please use a high entropy string or UUID" - ] - } + suggestions: [ + "Please use a high entropy string or UUID" ] }, %{ @@ -2153,16 +2145,11 @@ config :pleroma, :config_description, [ }, %{ group: :pleroma, + key: Pleroma.Web.Auth.Authenticator, label: "Pleroma Authenticator", - type: :group, + type: :module, description: "Authenticator", - children: [ - %{ - key: Pleroma.Web.Auth.Authenticator, - type: :module, - suggestions: [Pleroma.Web.Auth.PleromaAuthenticator, Pleroma.Web.Auth.LDAPAuthenticator] - } - ] + suggestions: [Pleroma.Web.Auth.PleromaAuthenticator, Pleroma.Web.Auth.LDAPAuthenticator] }, %{ group: :pleroma, diff --git a/config/test.exs b/config/test.exs index 87396a88d..80aa89f78 100644 --- a/config/test.exs +++ b/config/test.exs @@ -91,7 +91,9 @@ config :pleroma, Pleroma.ScheduledActivity, total_user_limit: 3, enabled: false -config :pleroma, :rate_limit, %{} +# Hack to drop default settings from `config.exs`, because keywords are deeply merged, so there is no other way to do it. +config :pleroma, :rate_limit, nil +config :pleroma, :rate_limit, [] config :pleroma, :http_security, report_uri: "https://endpoint.com" |