projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge develop
[akkoma]
/
config
/
config.exs
diff --git
a/config/config.exs
b/config/config.exs
index f866e8d2bda26be4ab6d2266615522d402071133..d8c8b1a6d385a34d312253a3d784cb40b851f44e 100644
(file)
--- a/
config/config.exs
+++ b/
config/config.exs
@@
-99,6
+99,7
@@
config :pleroma, Pleroma.Uploaders.MDII,
config :pleroma, :emoji,
shortcode_globs: ["/emoji/custom/**/*.png"],
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"]
groups: [
# Put groups that have higher priority than defaults here. Example in `docs/config/custom_emoji.md`
Custom: ["/emoji/*.png", "/emoji/**/*.png"]
@@
-139,6
+140,7
@@
config :pleroma, Pleroma.Web.Endpoint,
instrumenters: [Pleroma.Web.Endpoint.Instrumenter],
url: [host: "localhost"],
http: [
instrumenters: [Pleroma.Web.Endpoint.Instrumenter],
url: [host: "localhost"],
http: [
+ ip: {127, 0, 0, 1},
dispatch: [
{:_,
[
dispatch: [
{:_,
[
@@
-167,7
+169,7
@@
config :logger, :console,
config :logger, :ex_syslogger,
level: :debug,
config :logger, :ex_syslogger,
level: :debug,
- ident: "
P
leroma",
+ ident: "
p
leroma",
format: "$metadata[$level] $message",
metadata: [:request_id]
format: "$metadata[$level] $message",
metadata: [:request_id]
@@
-216,6
+218,7
@@
config :pleroma, :instance,
},
registrations_open: true,
federating: true,
},
registrations_open: true,
federating: true,
+ federation_incoming_replies_max_depth: 100,
federation_reachability_timeout_days: 7,
federation_publisher_modules: [
Pleroma.Web.ActivityPub.Publisher,
federation_reachability_timeout_days: 7,
federation_publisher_modules: [
Pleroma.Web.ActivityPub.Publisher,
@@
-245,7
+248,15
@@
config :pleroma, :instance,
healthcheck: false,
remote_post_retention_days: 90,
skip_thread_containment: true,
healthcheck: false,
remote_post_retention_days: 90,
skip_thread_containment: true,
- limit_to_local_content: :unauthenticated
+ limit_to_local_content: :unauthenticated,
+ dynamic_configuration: false,
+ external_user_synchronization: [
+ enabled: false,
+ # every 2 hours
+ interval: 60 * 60 * 2,
+ max_retries: 3,
+ limit: 500
+ ]
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
@@
-328,7
+339,10
@@
config :pleroma, :mrf_keyword,
config :pleroma, :mrf_subchain, match_actor: %{}
config :pleroma, :mrf_subchain, match_actor: %{}
-config :pleroma, :rich_media, enabled: true
+config :pleroma, :rich_media,
+ enabled: true,
+ ignore_hosts: [],
+ ignore_tld: ["local", "localdomain", "lan"]
config :pleroma, :media_proxy,
enabled: false,
config :pleroma, :media_proxy,
enabled: false,
@@
-352,7
+366,11
@@
config :pleroma, :gopher,
port: 9999
config :pleroma, Pleroma.Web.Metadata,
port: 9999
config :pleroma, Pleroma.Web.Metadata,
- providers: [Pleroma.Web.Metadata.Providers.RelMe],
+ providers: [
+ Pleroma.Web.Metadata.Providers.OpenGraph,
+ Pleroma.Web.Metadata.Providers.TwitterCard,
+ Pleroma.Web.Metadata.Providers.RelMe
+ ],
unfurl_nsfw: false
config :pleroma, :suggestions,
unfurl_nsfw: false
config :pleroma, :suggestions,
@@
-441,6
+459,8
@@
config :auto_linker,
opts: [
scheme: true,
extra: true,
opts: [
scheme: true,
extra: true,
+ # TODO: Set to :no_scheme when it works properly
+ validate_tld: true,
class: false,
strip_prefix: false,
new_window: false,
class: false,
strip_prefix: false,
new_window: false,
@@
-490,6
+510,14
@@
config :pleroma, Pleroma.ScheduledActivity,
total_user_limit: 300,
enabled: true
total_user_limit: 300,
enabled: true
+config :pleroma, :email_notifications,
+ digest: %{
+ active: false,
+ schedule: "0 0 * * 0",
+ interval: 7,
+ inactivity_threshold: 7
+ }
+
config :pleroma, :oauth2,
token_expires_in: 600,
issue_new_refresh_token: true,
config :pleroma, :oauth2,
token_expires_in: 600,
issue_new_refresh_token: true,