diff options
| author | Maksim Pechnikov <parallel588@gmail.com> | 2019-12-21 20:37:29 +0300 |
|---|---|---|
| committer | Maksim Pechnikov <parallel588@gmail.com> | 2019-12-21 20:38:59 +0300 |
| commit | 54c9db38c8035ecc115e136a09a3d991e426959a (patch) | |
| tree | 496afddf614e826c2c76c7d69e3968a3c118e717 /config | |
| parent | 67cb46e15dd5fa16da257a9b0e5166266d10c694 (diff) | |
| parent | c51e93978ea2aa0f2d5bcc43bf7c925b2590eece (diff) | |
| download | pleroma-54c9db38c8035ecc115e136a09a3d991e426959a.tar.gz pleroma-54c9db38c8035ecc115e136a09a3d991e426959a.zip | |
Merge branch 'develop' into issue/1383
Diffstat (limited to 'config')
| -rw-r--r-- | config/config.exs | 4 | ||||
| -rw-r--r-- | config/prod.exs | 4 | ||||
| -rw-r--r-- | config/releases.exs | 1 | ||||
| -rw-r--r-- | config/test.exs | 2 |
4 files changed, 8 insertions, 3 deletions
diff --git a/config/config.exs b/config/config.exs index a737c98af..bbd8f7d78 100644 --- a/config/config.exs +++ b/config/config.exs @@ -56,6 +56,8 @@ config :pleroma, Pleroma.Captcha, seconds_valid: 60, method: Pleroma.Captcha.Native +config :pleroma, Pleroma.Captcha.Kocaptcha, endpoint: "https://captcha.kotobank.ch" + config :pleroma, :hackney_pools, federation: [ max_connections: 50, @@ -609,6 +611,8 @@ config :pleroma, :web_cache_ttl, activity_pub: nil, activity_pub_question: 30_000 +config :pleroma, :modules, runtime_dir: "instance/modules" + # Import environment specific config. This must remain at the bottom # of this file so it overrides the configuration defined above. import_config "#{Mix.env()}.exs" diff --git a/config/prod.exs b/config/prod.exs index 25873f360..adbce5606 100644 --- a/config/prod.exs +++ b/config/prod.exs @@ -20,8 +20,8 @@ config :pleroma, Pleroma.Web.Endpoint, config :phoenix, serve_endpoints: true # Do not print debug messages in production -config :logger, :console, level: :warn -config :logger, :ex_syslogger, level: :warn +config :logger, :console, level: :info +config :logger, :ex_syslogger, level: :info # ## SSL Support # diff --git a/config/releases.exs b/config/releases.exs index 98c5ceccd..b224960db 100644 --- a/config/releases.exs +++ b/config/releases.exs @@ -2,6 +2,7 @@ import Config config :pleroma, :instance, static_dir: "/var/lib/pleroma/static" config :pleroma, Pleroma.Uploaders.Local, uploads: "/var/lib/pleroma/uploads" +config :pleroma, :modules, runtime_dir: "/var/lib/pleroma/modules" config_path = System.get_env("PLEROMA_CONFIG_PATH") || "/etc/pleroma/config.exs" diff --git a/config/test.exs b/config/test.exs index c204bf37f..ce4586c7b 100644 --- a/config/test.exs +++ b/config/test.exs @@ -91,7 +91,7 @@ config :joken, default_signer: "yU8uHKq+yyAkZ11Hx//jcdacWc8yQ1bxAAGrplzB0Zwwjkp3 config :pleroma, Pleroma.ReverseProxy.Client, Pleroma.ReverseProxy.ClientMock -config :pleroma, Pleroma.Captcha.Kocaptcha, endpoint: "https://captcha.kotobank.ch" +config :pleroma, :modules, runtime_dir: "test/fixtures/modules" if File.exists?("./config/test.secret.exs") do import_config "test.secret.exs" |