projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'test-coverage' into 'develop'
[akkoma]
/
config
/
config.exs
diff --git
a/config/config.exs
b/config/config.exs
index a1e6c8def36aeb7cf8285188eb964b3f55f3faa1..c143f79fc804136186e6c7da1a40b9b898a08613 100644
(file)
--- a/
config/config.exs
+++ b/
config/config.exs
@@
-8,8
+8,6
@@
use Mix.Config
# General application configuration
config :pleroma, ecto_repos: [Pleroma.Repo]
# General application configuration
config :pleroma, ecto_repos: [Pleroma.Repo]
-config :pleroma, Pleroma.Repo, types: Pleroma.PostgresTypes
-
config :pleroma, Pleroma.Captcha,
enabled: false,
seconds_valid: 60,
config :pleroma, Pleroma.Captcha,
enabled: false,
seconds_valid: 60,
@@
-34,7
+32,8
@@
config :pleroma, Pleroma.Captcha.Kocaptcha, endpoint: "https://captcha.kotobank.
# Upload configuration
config :pleroma, Pleroma.Upload,
uploader: Pleroma.Uploaders.Local,
# Upload configuration
config :pleroma, Pleroma.Upload,
uploader: Pleroma.Uploaders.Local,
- filters: [],
+ filters: [Pleroma.Upload.Filter.Dedupe],
+ link_name: true,
proxy_remote: false,
proxy_opts: [
redirect_on_failure: false,
proxy_remote: false,
proxy_opts: [
redirect_on_failure: false,
@@
-119,6
+118,11
@@
config :logger, :ex_syslogger,
format: "$metadata[$level] $message",
metadata: [:request_id]
format: "$metadata[$level] $message",
metadata: [:request_id]
+config :quack,
+ level: :warn,
+ meta: [:all],
+ webhook_url: "https://hooks.slack.com/services/YOUR-KEY-HERE"
+
config :mime, :types, %{
"application/xml" => ["xml"],
"application/xrd+xml" => ["xrd+xml"],
config :mime, :types, %{
"application/xml" => ["xml"],
"application/xrd+xml" => ["xrd+xml"],
@@
-173,7
+177,8
@@
config :pleroma, :instance,
no_attachment_links: false,
welcome_user_nickname: nil,
welcome_message: nil,
no_attachment_links: false,
welcome_user_nickname: nil,
welcome_message: nil,
- max_report_comment_size: 1000
+ max_report_comment_size: 1000,
+ safe_dm_mentions: false
config :pleroma, :markup,
# XXX - unfortunately, inline images must be enabled by default right now, because
config :pleroma, :markup,
# XXX - unfortunately, inline images must be enabled by default right now, because
@@
-272,8
+277,6
@@
config :pleroma, :media_proxy,
config :pleroma, :chat, enabled: true
config :pleroma, :chat, enabled: true
-config :ecto, json_library: Jason
-
config :phoenix, :format_encoders, json: Jason
config :pleroma, :gopher,
config :phoenix, :format_encoders, json: Jason
config :pleroma, :gopher,
@@
-350,10
+353,10
@@
config :pleroma, Pleroma.Web.Federator.RetryQueue,
initial_timeout: 30,
max_retries: 5
initial_timeout: 30,
max_retries: 5
-config :pleroma
, Pleroma.Job
s,
- federator_incoming:
[max_jobs: 50]
,
- federator_outgoing:
[max_jobs: 50]
,
- mailer:
[max_jobs: 10]
+config :pleroma
_job_queue, :queue
s,
+ federator_incoming:
50
,
+ federator_outgoing:
50
,
+ mailer:
10
config :pleroma, :fetch_initial_posts,
enabled: false,
config :pleroma, :fetch_initial_posts,
enabled: false,
@@
-380,6
+383,8
@@
config :pleroma, :ldap,
base: System.get_env("LDAP_BASE") || "dc=example,dc=com",
uid: System.get_env("LDAP_UID") || "cn"
base: System.get_env("LDAP_BASE") || "dc=example,dc=com",
uid: System.get_env("LDAP_UID") || "cn"
+config :pleroma, Pleroma.Mailer, adapter: Swoosh.Adapters.Sendmail
+
# 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"
# 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"