diff options
| author | Mark Felder <feld@FreeBSD.org> | 2020-01-26 11:23:05 -0600 |
|---|---|---|
| committer | Mark Felder <feld@FreeBSD.org> | 2020-01-26 11:23:05 -0600 |
| commit | d770cffce0aec0eeb427c8851437f04329700da9 (patch) | |
| tree | 8a6f4db2849e613e0be968d3c0edc605b7040563 /config/config.exs | |
| parent | 108a39c8766402dcbd0235d8746e2100a18e5813 (diff) | |
| parent | d9e2bd8f40b7d77713a72ef94da2fbe8ffa75b91 (diff) | |
| download | pleroma-d770cffce0aec0eeb427c8851437f04329700da9.tar.gz pleroma-d770cffce0aec0eeb427c8851437f04329700da9.zip | |
Merge branch 'develop' into issue/1280
Diffstat (limited to 'config/config.exs')
| -rw-r--r-- | config/config.exs | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/config/config.exs b/config/config.exs index b0036fff0..2c154eb45 100644 --- a/config/config.exs +++ b/config/config.exs @@ -112,7 +112,6 @@ config :pleroma, :emoji, shortcode_globs: ["/emoji/custom/**/*.png"], pack_extensions: [".png", ".gif"], groups: [ - # Put groups that have higher priority than defaults here. Example in `docs/config/custom_emoji.md` Custom: ["/emoji/*.png", "/emoji/**/*.png"] ], default_manifest: "https://git.pleroma.social/pleroma/emoji-index/raw/master/index.json", @@ -265,7 +264,6 @@ config :pleroma, :instance, remote_post_retention_days: 90, skip_thread_containment: true, limit_to_local_content: :unauthenticated, - dynamic_configuration: false, user_bio_length: 5000, user_name_length: 100, max_account_fields: 10, @@ -502,7 +500,8 @@ config :pleroma, Oban, mailer: 10, transmogrifier: 20, scheduled_activities: 10, - background: 5 + background: 5, + attachments_cleanup: 5 ] config :pleroma, :workers, @@ -619,6 +618,8 @@ config :pleroma, :web_cache_ttl, config :pleroma, :modules, runtime_dir: "instance/modules" +config :pleroma, configurable_from_database: false + config :swarm, node_blacklist: [~r/myhtml_.*$/] # Import environment specific config. This must remain at the bottom # of this file so it overrides the configuration defined above. |