From d903e34cacd18157a2a60e7b112eb05af2766266 Mon Sep 17 00:00:00 2001 From: raeno Date: Wed, 12 Dec 2018 22:37:00 +0300 Subject: Add opengraph/twitter_card:summary support. Add config to toggle on/off specific metadata --- config/config.exs | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'config') diff --git a/config/config.exs b/config/config.exs index 1401b0a3d..ad4b79f54 100644 --- a/config/config.exs +++ b/config/config.exs @@ -171,6 +171,10 @@ config :pleroma, :gopher, ip: {0, 0, 0, 0}, port: 9999 +config :pleroma, :metadata, + oembed: false, + opengraph: true + config :pleroma, :suggestions, enabled: false, third_party_engine: -- cgit v1.2.3 From b5de7c4c4d90d1049b59381953cbd76e79b77e66 Mon Sep 17 00:00:00 2001 From: raeno Date: Thu, 13 Dec 2018 22:16:54 +0100 Subject: Remove oembed for now, will submit it in another MR. Fix warnings --- config/config.exs | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'config') diff --git a/config/config.exs b/config/config.exs index ad4b79f54..5477c0c0e 100644 --- a/config/config.exs +++ b/config/config.exs @@ -171,9 +171,7 @@ config :pleroma, :gopher, ip: {0, 0, 0, 0}, port: 9999 -config :pleroma, :metadata, - oembed: false, - opengraph: true +config :pleroma, :metadata, opengraph: true config :pleroma, :suggestions, enabled: false, -- cgit v1.2.3 From c9b99d4486be83f3161c889558290cb9be758007 Mon Sep 17 00:00:00 2001 From: "Haelwenn (lanodan) Monnier" Date: Wed, 2 Jan 2019 23:07:48 +0100 Subject: config/config.exs: Add syslog backends --- config/config.exs | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'config') diff --git a/config/config.exs b/config/config.exs index 601d9e227..e084d1a88 100644 --- a/config/config.exs +++ b/config/config.exs @@ -91,6 +91,12 @@ config :logger, :console, format: "$time $metadata[$level] $message\n", metadata: [:request_id] +config :logger, :ex_syslogger, + level: :debug, + ident: "Pleroma", + format: "$date $time $metadata[$level] $message", + metadata: [:request_id] + config :mime, :types, %{ "application/xml" => ["xml"], "application/xrd+xml" => ["xrd+xml"], -- cgit v1.2.3 From 0fae04c4e3961baf1f31ae664e5a7fa5de19158e Mon Sep 17 00:00:00 2001 From: lain Date: Tue, 8 Jan 2019 09:55:33 +0100 Subject: Add a setting for users to autofollow on sign up. --- config/config.exs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'config') diff --git a/config/config.exs b/config/config.exs index e084d1a88..4f4e2368a 100644 --- a/config/config.exs +++ b/config/config.exs @@ -137,7 +137,8 @@ config :pleroma, :instance, "text/markdown" ], finmoji_enabled: true, - mrf_transparency: true + mrf_transparency: true, + autofollowed_nicknames: [] config :pleroma, :markup, # XXX - unfortunately, inline images must be enabled by default right now, because -- cgit v1.2.3 From 28afcb7c31a357e05c6cb23645539389f37a15f4 Mon Sep 17 00:00:00 2001 From: Egor Kislitsyn Date: Wed, 9 Jan 2019 17:02:30 +0700 Subject: move defaults from sample_config.exs to config.exs --- config/config.exs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'config') diff --git a/config/config.exs b/config/config.exs index 4f4e2368a..9301758f0 100644 --- a/config/config.exs +++ b/config/config.exs @@ -138,7 +138,8 @@ config :pleroma, :instance, ], finmoji_enabled: true, mrf_transparency: true, - autofollowed_nicknames: [] + autofollowed_nicknames: [], + max_pinned_statuses: 1 config :pleroma, :markup, # XXX - unfortunately, inline images must be enabled by default right now, because -- cgit v1.2.3 From 5419b1a030071a7fbe7385eff87132b4dbd8e0a3 Mon Sep 17 00:00:00 2001 From: Mark Felder Date: Thu, 10 Jan 2019 00:06:03 +0000 Subject: Alpha sort the restricted nicknames --- config/config.exs | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) (limited to 'config') diff --git a/config/config.exs b/config/config.exs index 4f4e2368a..9f0f4cd4f 100644 --- a/config/config.exs +++ b/config/config.exs @@ -237,34 +237,34 @@ config :cors_plug, config :pleroma, Pleroma.User, restricted_nicknames: [ - "about", + ".well-known", "~", - "main", - "users", - "settings", - "objects", + "about", "activities", - "web", - "registration", - "friend-requests", - "pleroma", "api", - "tag", + "auth", + "dev", + "friend-requests", + "inbox", + "internal", + "main", + "media", + "nodeinfo", "notice", - "status", - "user-search", - "ostatus_subscribe", "oauth", + "objects", + "ostatus_subscribe", + "pleroma", + "proxy", "push", + "registration", "relay", - "inbox", - ".well-known", - "nodeinfo", - "auth", - "proxy", - "dev", - "internal", - "media" + "settings", + "status", + "tag", + "user-search", + "users", + "web" ] config :pleroma, Pleroma.Web.Federator, max_jobs: 50 -- cgit v1.2.3 From ff6c9a5c961647b64c3c9fcc05932093595e9588 Mon Sep 17 00:00:00 2001 From: rinpatch Date: Tue, 15 Jan 2019 20:00:21 +0300 Subject: Introduce get_by_id in Activity, replace newlines with spaces --- config/config.exs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'config') diff --git a/config/config.exs b/config/config.exs index 895dbb3ab..b8c208cb4 100644 --- a/config/config.exs +++ b/config/config.exs @@ -207,7 +207,7 @@ config :pleroma, :gopher, ip: {0, 0, 0, 0}, port: 9999 -config :pleroma, :metadata, opengraph: true +config :pleroma, :metadata, providers: [] config :pleroma, :suggestions, enabled: false, -- cgit v1.2.3 From 76f80940da3979871923d647c95d7693b1c01fd5 Mon Sep 17 00:00:00 2001 From: rinpatch Date: Wed, 16 Jan 2019 17:19:01 +0300 Subject: oops --- config/config.exs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'config') diff --git a/config/config.exs b/config/config.exs index b8c208cb4..3448e31ca 100644 --- a/config/config.exs +++ b/config/config.exs @@ -207,7 +207,7 @@ config :pleroma, :gopher, ip: {0, 0, 0, 0}, port: 9999 -config :pleroma, :metadata, providers: [] +config :pleroma, Pleroma.Web.Metadata, providers: [] config :pleroma, :suggestions, enabled: false, -- cgit v1.2.3 From 207489aa25c1d222b0ee2aaec976210ecfc24481 Mon Sep 17 00:00:00 2001 From: Mark Felder Date: Thu, 17 Jan 2019 15:50:34 +0000 Subject: Also add to default config --- config/config.exs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'config') diff --git a/config/config.exs b/config/config.exs index 1c55807b7..d30b0aad0 100644 --- a/config/config.exs +++ b/config/config.exs @@ -139,7 +139,8 @@ config :pleroma, :instance, finmoji_enabled: true, mrf_transparency: true, autofollowed_nicknames: [], - max_pinned_statuses: 1 + max_pinned_statuses: 1, + no_attachment_links: false config :pleroma, :markup, # XXX - unfortunately, inline images must be enabled by default right now, because -- cgit v1.2.3 From a38f21f51dc810221cbf910556910a10f6104956 Mon Sep 17 00:00:00 2001 From: rinpatch Date: Fri, 18 Jan 2019 18:30:06 +0300 Subject: unfurl_nsfw: false by default --- config/config.exs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'config') diff --git a/config/config.exs b/config/config.exs index 3448e31ca..9c4d73465 100644 --- a/config/config.exs +++ b/config/config.exs @@ -207,7 +207,7 @@ config :pleroma, :gopher, ip: {0, 0, 0, 0}, port: 9999 -config :pleroma, Pleroma.Web.Metadata, providers: [] +config :pleroma, Pleroma.Web.Metadata, providers: [], unfurl_nsfw: false config :pleroma, :suggestions, enabled: false, -- cgit v1.2.3 From e221c681dcd387aa445c35957a32fdc0189a0955 Mon Sep 17 00:00:00 2001 From: lain Date: Wed, 23 Jan 2019 12:40:57 +0100 Subject: New frontend configuration mechanism. --- config/config.exs | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) (limited to 'config') diff --git a/config/config.exs b/config/config.exs index d30b0aad0..7f63a0a39 100644 --- a/config/config.exs +++ b/config/config.exs @@ -154,6 +154,7 @@ config :pleroma, :markup, Pleroma.HTML.Scrubber.Default ] +# Deprecated, will be gone in 1.0 config :pleroma, :fe, theme: "pleroma-dark", logo: "/static/logo.png", @@ -172,6 +173,24 @@ config :pleroma, :fe, subject_line_behavior: "email", always_show_subject_input: true +config :pleroma, :frontend_configurations, + pleroma_fe: %{ + theme: "pleroma-dark", + logo: "/static/logo.png", + background: "/static/aurora_borealis.jpg", + redirectRootNoLogin: "/main/all", + redirectRootLogin: "/main/friends", + showInstanceSpecificPanel: true, + scopeOptionsEnabled: false, + formattingOptionsEnabled: false, + collapseMessageWithSubject: false, + hidePostStats: false, + hideUserStats: false, + scopeCopy: true, + subjectLineBehavior: "email", + alwaysShowSubjectInput: true + } + config :pleroma, :activitypub, accept_blocks: true, unfollow_blocked: true, -- cgit v1.2.3 From 656ed7c84a5d8e423999457f66d8259ec8aa9a44 Mon Sep 17 00:00:00 2001 From: Ivan Tashkinov Date: Fri, 25 Jan 2019 15:10:21 +0300 Subject: [#534] Configurable outgoing federation reachability timeout. --- config/config.exs | 1 + 1 file changed, 1 insertion(+) (limited to 'config') diff --git a/config/config.exs b/config/config.exs index d30b0aad0..7a1a875c9 100644 --- a/config/config.exs +++ b/config/config.exs @@ -125,6 +125,7 @@ config :pleroma, :instance, banner_upload_limit: 4_000_000, registrations_open: true, federating: true, + federation_reachability_timeout_days: 90, allow_relay: true, rewrite_policy: Pleroma.Web.ActivityPub.MRF.NoOpPolicy, public: true, -- cgit v1.2.3 From 39b245773456b6bd5f0950139788108039557efa Mon Sep 17 00:00:00 2001 From: lain Date: Mon, 28 Jan 2019 13:04:51 +0100 Subject: Change default bg image in new config. --- config/config.exs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'config') diff --git a/config/config.exs b/config/config.exs index 7f63a0a39..1fec46f0b 100644 --- a/config/config.exs +++ b/config/config.exs @@ -177,7 +177,7 @@ config :pleroma, :frontend_configurations, pleroma_fe: %{ theme: "pleroma-dark", logo: "/static/logo.png", - background: "/static/aurora_borealis.jpg", + background: "/images/city.jpg", redirectRootNoLogin: "/main/all", redirectRootLogin: "/main/friends", showInstanceSpecificPanel: true, -- cgit v1.2.3 From 1d2f41642cfec5710055bcf8409778bb362beecb Mon Sep 17 00:00:00 2001 From: Ivan Tashkinov Date: Mon, 28 Jan 2019 15:25:06 +0300 Subject: [#534] Various tweaks. Tests for Instances and Instance. --- config/config.exs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'config') diff --git a/config/config.exs b/config/config.exs index 7a1a875c9..c0a936b17 100644 --- a/config/config.exs +++ b/config/config.exs @@ -125,7 +125,7 @@ config :pleroma, :instance, banner_upload_limit: 4_000_000, registrations_open: true, federating: true, - federation_reachability_timeout_days: 90, + federation_reachability_timeout_days: 7, allow_relay: true, rewrite_policy: Pleroma.Web.ActivityPub.MRF.NoOpPolicy, public: true, -- cgit v1.2.3 From 4aff4efa8d53988d00381b1346241359cf787e87 Mon Sep 17 00:00:00 2001 From: href Date: Wed, 30 Jan 2019 12:38:38 +0100 Subject: Use multiple hackney pools * federation (ap, salmon) * media (rich media, media proxy) * upload (uploader proxy) Each "part" will stop fighting others ones -- a huge federation outbound could before make the media proxy fail to checkout a connection in time. splitted media and uploaded media for the good reason than an upload pool will have all connections to the same host (the uploader upstream). it also has a longer default retention period for connections. --- config/config.exs | 34 ++++++++++++++++++++++++++++++++-- 1 file changed, 32 insertions(+), 2 deletions(-) (limited to 'config') diff --git a/config/config.exs b/config/config.exs index 1180a50bc..4dc7a62d7 100644 --- a/config/config.exs +++ b/config/config.exs @@ -15,6 +15,20 @@ config :pleroma, Pleroma.Captcha, seconds_valid: 60, method: Pleroma.Captcha.Kocaptcha +config :pleroma, :hackney_pools, + federation: [ + max_connections: 50, + timeout: 150_000 + ], + media: [ + max_connections: 50, + timeout: 150_000 + ], + upload: [ + max_connections: 25, + timeout: 300_000 + ] + config :pleroma, Pleroma.Captcha.Kocaptcha, endpoint: "https://captcha.kotobank.ch" # Upload configuration @@ -22,7 +36,14 @@ config :pleroma, Pleroma.Upload, uploader: Pleroma.Uploaders.Local, filters: [], proxy_remote: false, - proxy_opts: [] + proxy_opts: [ + redirect_on_failure: false, + max_body_length: 25 * 1_048_576, + http: [ + follow_redirect: true, + pool: :upload + ] + ] config :pleroma, Pleroma.Uploaders.Local, uploads: "uploads" @@ -214,7 +235,16 @@ config :pleroma, :mrf_simple, reject: [], accept: [] -config :pleroma, :media_proxy, enabled: false +config :pleroma, :media_proxy, + enabled: false, + proxy_opts: [ + redirect_on_failure: false, + max_body_length: 25 * 1_048_576, + http: [ + follow_redirect: true, + pool: :media + ] + ] config :pleroma, :chat, enabled: true -- cgit v1.2.3 From 7057891db649e1a72abfda13418d8c4bddd4ec92 Mon Sep 17 00:00:00 2001 From: rinpatch Date: Thu, 31 Jan 2019 18:18:20 +0300 Subject: Make rich media support toggleable --- config/config.exs | 2 ++ 1 file changed, 2 insertions(+) (limited to 'config') diff --git a/config/config.exs b/config/config.exs index 4dc7a62d7..98c94c149 100644 --- a/config/config.exs +++ b/config/config.exs @@ -235,6 +235,8 @@ config :pleroma, :mrf_simple, reject: [], accept: [] +config :pleroma, :rich_media, enabled: true + config :pleroma, :media_proxy, enabled: false, proxy_opts: [ -- cgit v1.2.3 From e61f0be9518aff867f4c56f5102723eddbcf40f1 Mon Sep 17 00:00:00 2001 From: lain Date: Sun, 3 Feb 2019 18:54:39 +0100 Subject: Unbreak all the tests. --- config/test.exs | 1 + 1 file changed, 1 insertion(+) (limited to 'config') diff --git a/config/test.exs b/config/test.exs index 67ed4737f..412970d93 100644 --- a/config/test.exs +++ b/config/test.exs @@ -36,6 +36,7 @@ config :pbkdf2_elixir, rounds: 1 config :pleroma, :websub, Pleroma.Web.WebsubMock config :pleroma, :ostatus, Pleroma.Web.OStatusMock config :tesla, adapter: Tesla.Mock +config :pleroma, :rich_media, enabled: false config :web_push_encryption, :vapid_details, subject: "mailto:administrator@example.com", -- cgit v1.2.3 From 0ef0ae35abf7c1f1016175bd446436f9e5dd8fc2 Mon Sep 17 00:00:00 2001 From: Karen Konou Date: Sun, 3 Feb 2019 20:12:23 +0100 Subject: added optional delist feature --- config/config.exs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'config') diff --git a/config/config.exs b/config/config.exs index d0d53a64a..8b42a5351 100644 --- a/config/config.exs +++ b/config/config.exs @@ -227,7 +227,9 @@ config :pleroma, :mrf_rejectnonpublic, allow_followersonly: false, allow_direct: false -config :pleroma, :mrf_hellthread, threshold: 10 +config :pleroma, :mrf_hellthread, + delist_threshold: 5, + reject_threshold: 10 config :pleroma, :mrf_simple, media_removal: [], -- cgit v1.2.3 From 43b3f9e96e84898a40f6605cb42afa630511d440 Mon Sep 17 00:00:00 2001 From: Michael Loftis Date: Wed, 6 Feb 2019 17:34:09 +0000 Subject: rids the duplicate timestamp from default ExSyslogger config --- config/config.exs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'config') diff --git a/config/config.exs b/config/config.exs index 8b42a5351..c272ef34a 100644 --- a/config/config.exs +++ b/config/config.exs @@ -115,7 +115,7 @@ config :logger, :console, config :logger, :ex_syslogger, level: :debug, ident: "Pleroma", - format: "$date $time $metadata[$level] $message", + format: "$metadata[$level] $message", metadata: [:request_id] config :mime, :types, %{ -- cgit v1.2.3 From 2174f6eb4f2b9b970e9823fe0846643fb274f009 Mon Sep 17 00:00:00 2001 From: rinpatch Date: Fri, 8 Feb 2019 12:48:39 +0300 Subject: Add default config for keyword policy --- config/config.exs | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'config') diff --git a/config/config.exs b/config/config.exs index 8b42a5351..223ab0c52 100644 --- a/config/config.exs +++ b/config/config.exs @@ -238,6 +238,11 @@ config :pleroma, :mrf_simple, reject: [], accept: [] +config :pleroma, :mrf_keyword, + reject: [], + ftl_removal: [], + replace: [] + config :pleroma, :rich_media, enabled: true config :pleroma, :media_proxy, -- cgit v1.2.3 From 8a0b755c19ef9c896f69de2b1bf22418a3aedf6f Mon Sep 17 00:00:00 2001 From: rinpatch Date: Fri, 8 Feb 2019 13:12:09 +0300 Subject: rename ftl_removal to federated_timeline_removal to keep consistent naming with SimplePolicy --- config/config.exs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'config') diff --git a/config/config.exs b/config/config.exs index 223ab0c52..33bb4b015 100644 --- a/config/config.exs +++ b/config/config.exs @@ -240,7 +240,7 @@ config :pleroma, :mrf_simple, config :pleroma, :mrf_keyword, reject: [], - ftl_removal: [], + federated_timeline_removal: [], replace: [] config :pleroma, :rich_media, enabled: true -- cgit v1.2.3 From 71ce564ecc442614995c021281a8f1e1a67fabc1 Mon Sep 17 00:00:00 2001 From: "Haelwenn (lanodan) Monnier" Date: Thu, 22 Nov 2018 07:12:13 +0100 Subject: =?UTF-8?q?config/dev.exs:=20Don=E2=80=99t=20put=20secure=20cookie?= =?UTF-8?q?s=20on=20dev?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/dev.exs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'config') diff --git a/config/dev.exs b/config/dev.exs index 8f89aa03c..f77bb9976 100644 --- a/config/dev.exs +++ b/config/dev.exs @@ -16,7 +16,8 @@ config :pleroma, Pleroma.Web.Endpoint, debug_errors: true, code_reloader: true, check_origin: false, - watchers: [] + watchers: [], + secure_cookie_flag: false config :pleroma, Pleroma.Mailer, adapter: Swoosh.Adapters.Local -- cgit v1.2.3