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