diff options
| author | Mark Felder <feld@FreeBSD.org> | 2020-01-12 12:12:15 -0600 |
|---|---|---|
| committer | Mark Felder <feld@FreeBSD.org> | 2020-01-12 12:12:15 -0600 |
| commit | 2f5b8fbeb3830759c00675f99d893a92b1d3edb2 (patch) | |
| tree | ee7ba90fa0b52e31cc7beeb9335deefbadd94e15 /config/config.exs | |
| parent | 933dc120438d14502e4bc4c29db904114fb6e438 (diff) | |
| parent | ecb8fe183c5a007e80d7b2b1bfc9ead89dc27cc2 (diff) | |
| download | pleroma-2f5b8fbeb3830759c00675f99d893a92b1d3edb2.tar.gz pleroma-2f5b8fbeb3830759c00675f99d893a92b1d3edb2.zip | |
Merge branch 'develop' into issue/1354
Diffstat (limited to 'config/config.exs')
| -rw-r--r-- | config/config.exs | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/config/config.exs b/config/config.exs index 47098858b..d41abf090 100644 --- a/config/config.exs +++ b/config/config.exs @@ -67,7 +67,7 @@ config :pleroma, Pleroma.Scheduler, config :pleroma, Pleroma.Captcha, enabled: true, - seconds_valid: 60, + seconds_valid: 300, method: Pleroma.Captcha.Native config :pleroma, Pleroma.Captcha.Kocaptcha, endpoint: "https://captcha.kotobank.ch" @@ -108,10 +108,6 @@ config :pleroma, Pleroma.Uploaders.S3, streaming_enabled: true, public_endpoint: "https://s3.amazonaws.com" -config :pleroma, Pleroma.Uploaders.MDII, - cgi: "https://mdii.sakura.ne.jp/mdii-post.cgi", - files: "https://mdii.sakura.ne.jp" - config :pleroma, :emoji, shortcode_globs: ["/emoji/custom/**/*.png"], pack_extensions: [".png", ".gif"], @@ -621,6 +617,8 @@ config :pleroma, :web_cache_ttl, activity_pub: nil, activity_pub_question: 30_000 +config :pleroma, :modules, runtime_dir: "instance/modules" + 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. |