diff options
| author | Ivan Tashkinov <ivantashkinov@gmail.com> | 2020-01-02 13:03:33 +0300 |
|---|---|---|
| committer | Ivan Tashkinov <ivantashkinov@gmail.com> | 2020-01-02 13:03:33 +0300 |
| commit | badd0a96eaa9ff8fca7d25eccd05e8428e132699 (patch) | |
| tree | 0c6a441f993935525bc4a706e98c8e36e11e7b10 /config/config.exs | |
| parent | ead2d18826cf446fd7da542c55b6601e9bfc001c (diff) | |
| parent | ee0c40831efde5054f587ae0e371fffcad1396b7 (diff) | |
| download | pleroma-badd0a96eaa9ff8fca7d25eccd05e8428e132699.tar.gz pleroma-badd0a96eaa9ff8fca7d25eccd05e8428e132699.zip | |
Merge remote-tracking branch 'remotes/origin/develop' into oauth-scopes-tweaks-and-tests
Diffstat (limited to 'config/config.exs')
| -rw-r--r-- | config/config.exs | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/config/config.exs b/config/config.exs index 47098858b..c8d42e83e 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: 3000, method: Pleroma.Captcha.Native config :pleroma, Pleroma.Captcha.Kocaptcha, endpoint: "https://captcha.kotobank.ch" @@ -621,6 +621,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. |