diff options
| author | Maksim Pechnikov <parallel588@gmail.com> | 2019-12-17 09:24:08 +0300 |
|---|---|---|
| committer | Maksim Pechnikov <parallel588@gmail.com> | 2019-12-17 09:24:08 +0300 |
| commit | a879c396bb3a07929d4821ef2c29610808962c6d (patch) | |
| tree | c0e64cdda3a4ab59d2fbdd25db65d8d795dba6c6 /config | |
| parent | 22fc271e23a5dd1570ea7429b563f6edc42613c4 (diff) | |
| parent | 804b961d3c8e0034c7b6057a164126e5d01a084b (diff) | |
| download | pleroma-a879c396bb3a07929d4821ef2c29610808962c6d.tar.gz pleroma-a879c396bb3a07929d4821ef2c29610808962c6d.zip | |
Merge branch 'develop' into feature/tag_feed
Diffstat (limited to 'config')
| -rw-r--r-- | config/config.exs | 14 | ||||
| -rw-r--r-- | config/description.exs | 9 | ||||
| -rw-r--r-- | config/test.exs | 4 |
3 files changed, 21 insertions, 6 deletions
diff --git a/config/config.exs b/config/config.exs index b60ffef7d..47098858b 100644 --- a/config/config.exs +++ b/config/config.exs @@ -66,9 +66,11 @@ config :pleroma, Pleroma.Scheduler, jobs: scheduled_jobs config :pleroma, Pleroma.Captcha, - enabled: false, + enabled: true, seconds_valid: 60, - method: Pleroma.Captcha.Kocaptcha + method: Pleroma.Captcha.Native + +config :pleroma, Pleroma.Captcha.Kocaptcha, endpoint: "https://captcha.kotobank.ch" config :pleroma, :hackney_pools, federation: [ @@ -84,8 +86,6 @@ config :pleroma, :hackney_pools, timeout: 300_000 ] -config :pleroma, Pleroma.Captcha.Kocaptcha, endpoint: "https://captcha.kotobank.ch" - # Upload configuration config :pleroma, Pleroma.Upload, uploader: Pleroma.Uploaders.Local, @@ -225,6 +225,7 @@ config :pleroma, :instance, notify_email: "noreply@example.com", description: "A Pleroma instance, an alternative fediverse server", limit: 5_000, + chat_limit: 5_000, remote_limit: 100_000, upload_limit: 16_000_000, avatar_upload_limit: 2_000_000, @@ -562,7 +563,10 @@ config :ueberauth, base_path: "/oauth", providers: ueberauth_providers -config :pleroma, :auth, oauth_consumer_strategies: oauth_consumer_strategies +config :pleroma, + :auth, + enforce_oauth_admin_scope_usage: false, + oauth_consumer_strategies: oauth_consumer_strategies config :pleroma, Pleroma.Emails.Mailer, adapter: Swoosh.Adapters.Sendmail, enabled: false diff --git a/config/description.exs b/config/description.exs index 70e963399..45e4b43f1 100644 --- a/config/description.exs +++ b/config/description.exs @@ -2095,6 +2095,15 @@ config :pleroma, :config_description, [ description: "Authentication / authorization settings", children: [ %{ + key: :enforce_oauth_admin_scope_usage, + type: :boolean, + description: + "OAuth admin scope requirement toggle. " <> + "If `true`, admin actions explicitly demand admin OAuth scope(s) presence in OAuth token " <> + "(client app must support admin scopes). If `false` and token doesn't have admin scope(s)," <> + "`is_admin` user flag grants access to admin-specific actions." + }, + %{ key: :auth_template, type: :string, description: diff --git a/config/test.exs b/config/test.exs index 9b737d4d7..d52ced612 100644 --- a/config/test.exs +++ b/config/test.exs @@ -68,7 +68,9 @@ config :pleroma, Oban, queues: false, prune: :disabled -config :pleroma, Pleroma.Scheduler, jobs: [] +config :pleroma, Pleroma.Scheduler, + jobs: [], + global: false config :pleroma, Pleroma.ScheduledActivity, daily_user_limit: 2, |