From eb84de01439c4ee25f59390e5be4ffa7f36e01b8 Mon Sep 17 00:00:00 2001
From: Egor Kislitsyn <egor@kislitsyn.com>
Date: Mon, 4 Mar 2019 19:55:11 +0700
Subject: allow users to disable their own account

---
 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 a620e7451..d9ed43dda 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -343,7 +343,8 @@ config :pleroma, Pleroma.Web.Federator.RetryQueue,
 config :pleroma, Pleroma.Jobs,
   federator_incoming: [max_jobs: 50],
   federator_outgoing: [max_jobs: 50],
-  mailer: [max_jobs: 10]
+  mailer: [max_jobs: 10],
+  user: [max_jobs: 10]
 
 config :auto_linker,
   opts: [
-- 
cgit v1.2.3


From 10fdc080a0048a4776abb4bd1b5aa22d8c65e2da Mon Sep 17 00:00:00 2001
From: lain <lain@soykaf.club>
Date: Sun, 31 Mar 2019 20:35:10 +0200
Subject: BBS: Tests and formatting.

---
 config/config.exs | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'config')

diff --git a/config/config.exs b/config/config.exs
index 0df38d75a..33724346e 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -378,6 +378,9 @@ config :pleroma, :ldap,
   base: System.get_env("LDAP_BASE") || "dc=example,dc=com",
   uid: System.get_env("LDAP_UID") || "cn"
 
+config :esshd,
+  enabled: false
+
 # 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"
-- 
cgit v1.2.3


From ce6ca0fefe7feb1c31447287aec117d40233652a Mon Sep 17 00:00:00 2001
From: Alexander Strizhakov <alex.strizhakov@gmail.com>
Date: Mon, 6 May 2019 16:45:22 +0000
Subject: Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma
 into feature/845-improve-status-deletion

---
 config/config.exs | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'config')

diff --git a/config/config.exs b/config/config.exs
index 1a9738cff..12dbe9941 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -232,7 +232,8 @@ config :pleroma, :instance,
   welcome_message: nil,
   max_report_comment_size: 1000,
   safe_dm_mentions: false,
-  healthcheck: false
+  healthcheck: false,
+  repo_batch_size: 500
 
 config :pleroma, :markup,
   # XXX - unfortunately, inline images must be enabled by default right now, because
@@ -416,7 +417,8 @@ config :pleroma_job_queue, :queues,
   web_push: 50,
   mailer: 10,
   transmogrifier: 20,
-  scheduled_activities: 10
+  scheduled_activities: 10,
+  background: 5
 
 config :pleroma, :fetch_initial_posts,
   enabled: false,
-- 
cgit v1.2.3


From 1040caf096347b638b9fda5b23fcccde87b32ede Mon Sep 17 00:00:00 2001
From: Maksim <parallel588@gmail.com>
Date: Mon, 6 May 2019 17:51:03 +0000
Subject: fix format

Modified-by: Maksim Pechnikov <parallel588@gmail.com>
---
 config/config.exs | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'config')

diff --git a/config/config.exs b/config/config.exs
index 7792e9a87..946ba9adf 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -473,6 +473,10 @@ config :pleroma, Pleroma.ScheduledActivity,
   total_user_limit: 300,
   enabled: true
 
+config :pleroma, :oauth2,
+  token_expires_in: 600,
+  issue_new_refresh_token: true
+
 # 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"
-- 
cgit v1.2.3


From f46295faa7002b3afd8cde1c1de302212195ada2 Mon Sep 17 00:00:00 2001
From: Alex S <alex.strizhakov@gmail.com>
Date: Tue, 7 May 2019 09:07:06 +0700
Subject: unused config paramater

---
 config/config.exs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'config')

diff --git a/config/config.exs b/config/config.exs
index 946ba9adf..1e64b79a7 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -232,8 +232,7 @@ config :pleroma, :instance,
   welcome_message: nil,
   max_report_comment_size: 1000,
   safe_dm_mentions: false,
-  healthcheck: false,
-  repo_batch_size: 500
+  healthcheck: false
 
 config :pleroma, :markup,
   # XXX - unfortunately, inline images must be enabled by default right now, because
-- 
cgit v1.2.3


From 10695a28d28d74f4b6b9bba20af66b506b662c07 Mon Sep 17 00:00:00 2001
From: William Pitcock <nenolod@dereferenced.org>
Date: Sun, 12 May 2019 03:55:17 +0000
Subject: federator: publisher: add publish() wrapper

---
 config/config.exs | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'config')

diff --git a/config/config.exs b/config/config.exs
index 1e64b79a7..37803383a 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -212,6 +212,9 @@ config :pleroma, :instance,
   registrations_open: true,
   federating: true,
   federation_reachability_timeout_days: 7,
+  federation_publisher_modules: [
+    Pleroma.Web.ActivityPub.Publisher
+  ],
   allow_relay: true,
   rewrite_policy: Pleroma.Web.ActivityPub.MRF.NoOpPolicy,
   public: true,
-- 
cgit v1.2.3


From 179293e51c2e381fdc15c0a291b735750f9cd656 Mon Sep 17 00:00:00 2001
From: William Pitcock <nenolod@dereferenced.org>
Date: Sun, 12 May 2019 04:27:01 +0000
Subject: salmon: refactor to work as a federator publishing module

---
 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 37803383a..3dcff3c46 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -213,7 +213,8 @@ config :pleroma, :instance,
   federating: true,
   federation_reachability_timeout_days: 7,
   federation_publisher_modules: [
-    Pleroma.Web.ActivityPub.Publisher
+    Pleroma.Web.ActivityPub.Publisher,
+    Pleroma.Web.Salmon
   ],
   allow_relay: true,
   rewrite_policy: Pleroma.Web.ActivityPub.MRF.NoOpPolicy,
-- 
cgit v1.2.3


From fedaca15a3932897d86f73d836b6b6c2f7860f59 Mon Sep 17 00:00:00 2001
From: William Pitcock <nenolod@dereferenced.org>
Date: Sun, 12 May 2019 04:34:55 +0000
Subject: websub: adapt to work as a federator publishing module

---
 config/config.exs | 1 +
 1 file changed, 1 insertion(+)

(limited to 'config')

diff --git a/config/config.exs b/config/config.exs
index 3dcff3c46..6f2aaf297 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -214,6 +214,7 @@ config :pleroma, :instance,
   federation_reachability_timeout_days: 7,
   federation_publisher_modules: [
     Pleroma.Web.ActivityPub.Publisher,
+    Pleroma.Web.Websub,
     Pleroma.Web.Salmon
   ],
   allow_relay: true,
-- 
cgit v1.2.3


From a2be420f940fb8f181feeb9b0fb9759d433dcae1 Mon Sep 17 00:00:00 2001
From: Alexander Strizhakov <alex.strizhakov@gmail.com>
Date: Mon, 13 May 2019 18:35:45 +0000
Subject: differences_in_mastoapi_responses.md: fullname & bio are optionnal

[ci skip]
---
 config/config.exs | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'config')

diff --git a/config/config.exs b/config/config.exs
index 1e64b79a7..e8aad855c 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -234,6 +234,8 @@ config :pleroma, :instance,
   safe_dm_mentions: false,
   healthcheck: false
 
+config :pleroma, :app_account_creation, enabled: false, max_requests: 5, interval: 1800
+
 config :pleroma, :markup,
   # XXX - unfortunately, inline images must be enabled by default right now, because
   # of custom emoji.  Issue #275 discusses defanging that somehow.
-- 
cgit v1.2.3


From 38f3393e934330454fb942048c19ee5640563a08 Mon Sep 17 00:00:00 2001
From: rinpatch <rinpatch@sdf.org>
Date: Tue, 14 May 2019 22:47:23 +0300
Subject: Make rate limiting for Mastodon Registration API less agressive and
 enable it by default.

As discussed on irc. Unlike Mastodon our web interface for registrations
is using the same APIs regular apps would be using, so 5 requests per 30
minutes per IP could hurt valid use-cases when Pleroma-FE switches to
it. Also enable the endpoint by default, it makes no sense to
have it disabled when
1. TwitterAPI endpoint is there and always enabled
2. Unlike Mastodon, there is no way to get an account without using the APIs (makes me wonder why the setting is even there)

Also in this commit: minor changelog improvements.
---
 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 8d44c96de..32c7fecb8 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -239,7 +239,7 @@ config :pleroma, :instance,
   safe_dm_mentions: false,
   healthcheck: false
 
-config :pleroma, :app_account_creation, enabled: false, max_requests: 5, interval: 1800
+config :pleroma, :app_account_creation, enabled: true, max_requests: 25, interval: 1800
 
 config :pleroma, :markup,
   # XXX - unfortunately, inline images must be enabled by default right now, because
-- 
cgit v1.2.3


From 071f78733aaa8a6546c9267d14381be9c0af0333 Mon Sep 17 00:00:00 2001
From: William Pitcock <nenolod@dereferenced.org>
Date: Tue, 14 May 2019 20:03:13 +0000
Subject: switch to pleroma/http_signatures library

---
 config/config.exs | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'config')

diff --git a/config/config.exs b/config/config.exs
index 8d44c96de..b75a370f1 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -484,6 +484,9 @@ config :pleroma, :oauth2,
   token_expires_in: 600,
   issue_new_refresh_token: true
 
+config :http_signatures,
+  adapter: Pleroma.Signature
+
 # 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"
-- 
cgit v1.2.3


From 2ca8d20053ef2abda070b8aba0e6937cf2f07991 Mon Sep 17 00:00:00 2001
From: rinpatch <rinpatch@sdf.org>
Date: Tue, 14 May 2019 23:16:34 +0300
Subject: Fix rate-limiting tests

---
 config/test.exs | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'config')

diff --git a/config/test.exs b/config/test.exs
index f93bc5994..a0c90c371 100644
--- a/config/test.exs
+++ b/config/test.exs
@@ -59,6 +59,8 @@ config :pleroma, Pleroma.ScheduledActivity,
   total_user_limit: 3,
   enabled: false
 
+config :pleroma, :app_account_creation, max_requests: 5
+
 try do
   import_config "test.secret.exs"
 rescue
-- 
cgit v1.2.3


From 6c9f45f4ddde48d2239ab68916e65d0ee5c2be76 Mon Sep 17 00:00:00 2001
From: Egor Kislitsyn <egor@kislitsyn.com>
Date: Wed, 15 May 2019 14:40:20 +0700
Subject: Remove unused queue from the config

---
 config/config.exs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'config')

diff --git a/config/config.exs b/config/config.exs
index 32c7fecb8..3452eb1bb 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -424,8 +424,7 @@ config :pleroma_job_queue, :queues,
   mailer: 10,
   transmogrifier: 20,
   scheduled_activities: 10,
-  background: 5,
-  user: 10
+  background: 5
 
 config :pleroma, :fetch_initial_posts,
   enabled: false,
-- 
cgit v1.2.3


From ee22fff5ac4631edc6035e349c787d29a13adeaf Mon Sep 17 00:00:00 2001
From: Sachin Joshi <satchin.joshi@gmail.com>
Date: Tue, 14 May 2019 23:37:08 +0545
Subject: remove deprecated PleromaFE configuration

---
 config/config.exs | 19 -------------------
 1 file changed, 19 deletions(-)

(limited to 'config')

diff --git a/config/config.exs b/config/config.exs
index 8d44c96de..35ddbad8a 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -253,25 +253,6 @@ config :pleroma, :markup,
     Pleroma.HTML.Scrubber.Default
   ]
 
-# Deprecated, will be gone in 1.0
-config :pleroma, :fe,
-  theme: "pleroma-dark",
-  logo: "/static/logo.png",
-  logo_mask: true,
-  logo_margin: "0.1em",
-  background: "/static/aurora_borealis.jpg",
-  redirect_root_no_login: "/main/all",
-  redirect_root_login: "/main/friends",
-  show_instance_panel: true,
-  scope_options_enabled: false,
-  formatting_options_enabled: false,
-  collapse_message_with_subject: false,
-  hide_post_stats: false,
-  hide_user_stats: false,
-  scope_copy: true,
-  subject_line_behavior: "email",
-  always_show_subject_input: true
-
 config :pleroma, :frontend_configurations,
   pleroma_fe: %{
     theme: "pleroma-dark",
-- 
cgit v1.2.3


From f1e67bdc312ba16a37916024244d6cb9d4417c9e Mon Sep 17 00:00:00 2001
From: lain <lain@soykaf.club>
Date: Wed, 15 May 2019 15:28:01 +0200
Subject: Search: Add optional rum indexing / searching.

---
 config/config.exs | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'config')

diff --git a/config/config.exs b/config/config.exs
index 1e64b79a7..42e4cb4ce 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -476,6 +476,8 @@ config :pleroma, :oauth2,
   token_expires_in: 600,
   issue_new_refresh_token: true
 
+config :pleroma, :database, rum_enabled: false
+
 # 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"
-- 
cgit v1.2.3


From aa11fa4864bf6ebdd4acfdba837675abbdcffc83 Mon Sep 17 00:00:00 2001
From: Alex S <alex.strizhakov@gmail.com>
Date: Thu, 16 May 2019 12:49:40 +0700
Subject: add report uri and report to

---
 config/test.exs | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'config')

diff --git a/config/test.exs b/config/test.exs
index a0c90c371..40db66170 100644
--- a/config/test.exs
+++ b/config/test.exs
@@ -61,6 +61,8 @@ config :pleroma, Pleroma.ScheduledActivity,
 
 config :pleroma, :app_account_creation, max_requests: 5
 
+config :pleroma, :http_security, report_uri: "https://endpoint.com"
+
 try do
   import_config "test.secret.exs"
 rescue
-- 
cgit v1.2.3


From e39c190f046bb345e80a2195278bb59ac81b8002 Mon Sep 17 00:00:00 2001
From: lain <lain@soykaf.club>
Date: Fri, 17 May 2019 11:30:35 +0200
Subject: Configuration: disable migration lock.

---
 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 3d11c3a87..92d3e0dcd 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -48,7 +48,8 @@ config :pleroma, ecto_repos: [Pleroma.Repo]
 
 config :pleroma, Pleroma.Repo,
   types: Pleroma.PostgresTypes,
-  telemetry_event: [Pleroma.Repo.Instrumenter]
+  telemetry_event: [Pleroma.Repo.Instrumenter],
+  migration_lock: nil
 
 config :pleroma, Pleroma.Captcha,
   enabled: false,
-- 
cgit v1.2.3


From 8784a7d1b40394cb1b4d5ce2d04b8cd057a57ceb Mon Sep 17 00:00:00 2001
From: lain <lain@soykaf.club>
Date: Fri, 17 May 2019 15:06:51 +0200
Subject: RUM: Set rum status by the environment.

---
 config/test.exs | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'config')

diff --git a/config/test.exs b/config/test.exs
index 40db66170..e1785d10f 100644
--- a/config/test.exs
+++ b/config/test.exs
@@ -63,6 +63,10 @@ config :pleroma, :app_account_creation, max_requests: 5
 
 config :pleroma, :http_security, report_uri: "https://endpoint.com"
 
+rum_enabled = System.get_env("RUM_ENABLED") == "true"
+config :pleroma, :database, rum_enabled: rum_enabled
+IO.puts("RUM enabled: #{rum_enabled}")
+
 try do
   import_config "test.secret.exs"
 rescue
-- 
cgit v1.2.3


From 290f5b2cfe91dd2acba56f79ef137f15c68a0db0 Mon Sep 17 00:00:00 2001
From: William Pitcock <nenolod@dereferenced.org>
Date: Fri, 17 May 2019 20:28:58 +0000
Subject: config: make sending the user agent configurable, disable sending the
 user agent in tests

---
 config/config.exs | 1 +
 config/test.exs   | 2 ++
 2 files changed, 3 insertions(+)

(limited to 'config')

diff --git a/config/config.exs b/config/config.exs
index e82f08e07..9a10b0ff7 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -192,6 +192,7 @@ config :tesla, adapter: Tesla.Adapter.Hackney
 # Configures http settings, upstream proxy etc.
 config :pleroma, :http,
   proxy_url: nil,
+  send_user_agent: true,
   adapter: [
     ssl_options: [
       # We don't support TLS v1.3 yet
diff --git a/config/test.exs b/config/test.exs
index e1785d10f..6100989c4 100644
--- a/config/test.exs
+++ b/config/test.exs
@@ -63,6 +63,8 @@ config :pleroma, :app_account_creation, max_requests: 5
 
 config :pleroma, :http_security, report_uri: "https://endpoint.com"
 
+config :pleroma, :http, send_user_agent: false
+
 rum_enabled = System.get_env("RUM_ENABLED") == "true"
 config :pleroma, :database, rum_enabled: rum_enabled
 IO.puts("RUM enabled: #{rum_enabled}")
-- 
cgit v1.2.3


From 2375e9a95ba9042958ff7e8f75830df4ab53fed2 Mon Sep 17 00:00:00 2001
From: Aaron Tinio <aptinio@gmail.com>
Date: Mon, 20 May 2019 06:02:50 +0800
Subject: Add report filtering to MRF.SimplePolicy

---
 config/config.exs | 1 +
 1 file changed, 1 insertion(+)

(limited to 'config')

diff --git a/config/config.exs b/config/config.exs
index 9a10b0ff7..bab47a8a2 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -298,6 +298,7 @@ config :pleroma, :mrf_simple,
   media_removal: [],
   media_nsfw: [],
   federated_timeline_removal: [],
+  report_removal: [],
   reject: [],
   accept: []
 
-- 
cgit v1.2.3


From daeae8e2e7c506b72c66dea6ac790408f948ec16 Mon Sep 17 00:00:00 2001
From: Sadposter <hannah+pleroma@coffee-and-dreams.uk>
Date: Mon, 20 May 2019 16:12:55 +0100
Subject: Move default mascot configuration to `config/`

---
 config/config.exs | 13 +++++++++++++
 1 file changed, 13 insertions(+)

(limited to 'config')

diff --git a/config/config.exs b/config/config.exs
index bab47a8a2..72908266d 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -276,6 +276,19 @@ config :pleroma, :frontend_configurations,
     showInstanceSpecificPanel: true
   }
 
+config :pleroma, :assets,
+  mascots: [
+    pleroma_fox_tan: %{
+      url: "/images/pleroma-fox-tan-smol.png",
+      mime_type: "image/png"
+    },
+    pleroma_fox_tan_shy: %{
+      url: "/images/pleroma-fox-tan-shy.png",
+      mime_type: "image/png"
+    }
+  ],
+  default_mascot: :pleroma_fox_tan
+
 config :pleroma, :activitypub,
   accept_blocks: true,
   unfollow_blocked: true,
-- 
cgit v1.2.3


From 75c7bb9289066bfaebe7d96aaa474d34ec4d5a5f Mon Sep 17 00:00:00 2001
From: Mark Felder <feld@FreeBSD.org>
Date: Mon, 20 May 2019 17:18:59 -0500
Subject: Additional reserved usernames

---
 config/config.exs | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'config')

diff --git a/config/config.exs b/config/config.exs
index 61e2648a9..387c1a5a7 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -369,6 +369,7 @@ config :pleroma, Pleroma.User,
     "activities",
     "api",
     "auth",
+    "check_password",
     "dev",
     "friend-requests",
     "inbox",
@@ -389,6 +390,7 @@ config :pleroma, Pleroma.User,
     "status",
     "tag",
     "user-search",
+    "user_exists",
     "users",
     "web"
   ]
-- 
cgit v1.2.3


From 76a7429befb2e9a819b653ff8328cc42a565c29d Mon Sep 17 00:00:00 2001
From: rinpatch <rinpatch@sdf.org>
Date: Tue, 21 May 2019 09:13:10 +0300
Subject: Add poll limits to /api/v1/instance and initial state

---
 config/config.exs | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'config')

diff --git a/config/config.exs b/config/config.exs
index 9a10b0ff7..47d8dfb42 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -211,6 +211,12 @@ config :pleroma, :instance,
   avatar_upload_limit: 2_000_000,
   background_upload_limit: 4_000_000,
   banner_upload_limit: 4_000_000,
+  poll_limits: %{
+    max_options: 20,
+    max_option_chars: 200,
+    min_expiration: 0,
+    max_expiration: 365 * 24 * 60 * 60
+  },
   registrations_open: true,
   federating: true,
   federation_reachability_timeout_days: 7,
-- 
cgit v1.2.3


From 16b260fb19cca02463766c2e36a41bfcc823af9b Mon Sep 17 00:00:00 2001
From: William Pitcock <nenolod@dereferenced.org>
Date: Tue, 21 May 2019 01:21:28 +0000
Subject: add mix task to prune the object database using a configured
 retention period

---
 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 72908266d..466a6e9b7 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -239,7 +239,8 @@ config :pleroma, :instance,
   welcome_message: nil,
   max_report_comment_size: 1000,
   safe_dm_mentions: false,
-  healthcheck: false
+  healthcheck: false,
+  remote_post_retention_days: 90
 
 config :pleroma, :app_account_creation, enabled: true, max_requests: 25, interval: 1800
 
-- 
cgit v1.2.3


From 620908a2db86942a00bc0ba9c71c037061e26967 Mon Sep 17 00:00:00 2001
From: Maksim <parallel588@gmail.com>
Date: Wed, 22 May 2019 15:44:50 +0000
Subject: [#699] add worker to clean expired oauth tokens

---
 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 a05f8b1d2..33b7e713d 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -481,7 +481,9 @@ config :pleroma, Pleroma.ScheduledActivity,
 
 config :pleroma, :oauth2,
   token_expires_in: 600,
-  issue_new_refresh_token: true
+  issue_new_refresh_token: true,
+  clean_expired_tokens: false,
+  clean_expired_tokens_interval: 86_400_000
 
 config :pleroma, :database, rum_enabled: false
 
-- 
cgit v1.2.3


From baf72d6c580e5c05ef5fea8a57c57150a5d38589 Mon Sep 17 00:00:00 2001
From: William Pitcock <nenolod@dereferenced.org>
Date: Wed, 22 May 2019 04:55:16 +0000
Subject: mrf: simple policy: add the ability to strip avatars and banners from
 user profiles

---
 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 33b7e713d..e90821d66 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -314,7 +314,9 @@ config :pleroma, :mrf_simple,
   federated_timeline_removal: [],
   report_removal: [],
   reject: [],
-  accept: []
+  accept: [],
+  avatar_removal: [],
+  banner_removal: []
 
 config :pleroma, :mrf_keyword,
   reject: [],
-- 
cgit v1.2.3


From 9bec891eb4d5d06e6bd84dd2c95259d2c1a4f563 Mon Sep 17 00:00:00 2001
From: William Pitcock <nenolod@dereferenced.org>
Date: Sat, 25 May 2019 04:24:21 +0000
Subject: kill @httpoison

---
 config/config.exs | 1 -
 1 file changed, 1 deletion(-)

(limited to 'config')

diff --git a/config/config.exs b/config/config.exs
index e90821d66..01827fb5f 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -186,7 +186,6 @@ config :mime, :types, %{
 
 config :pleroma, :websub, Pleroma.Web.Websub
 config :pleroma, :ostatus, Pleroma.Web.OStatus
-config :pleroma, :httpoison, Pleroma.HTTP
 config :tesla, adapter: Tesla.Adapter.Hackney
 
 # Configures http settings, upstream proxy etc.
-- 
cgit v1.2.3


From 80d55d428fedfe4ebc44569c6134908d269db698 Mon Sep 17 00:00:00 2001
From: William Pitcock <nenolod@dereferenced.org>
Date: Sat, 25 May 2019 04:34:16 +0000
Subject: tests: websub: check only that signature validation succeeds or fails

---
 config/test.exs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'config')

diff --git a/config/test.exs b/config/test.exs
index 6100989c4..3bc407840 100644
--- a/config/test.exs
+++ b/config/test.exs
@@ -39,8 +39,8 @@ config :pleroma, Pleroma.Repo,
 # Reduce hash rounds for testing
 config :pbkdf2_elixir, rounds: 1
 
-config :pleroma, :websub, Pleroma.Web.WebsubMock
-config :pleroma, :ostatus, Pleroma.Web.OStatusMock
+#config :pleroma, :websub, Pleroma.Web.WebsubMock
+#config :pleroma, :ostatus, Pleroma.Web.OStatusMock
 config :tesla, adapter: Tesla.Mock
 config :pleroma, :rich_media, enabled: false
 
-- 
cgit v1.2.3


From 56fd7dbdd7e3f1a0bb05430ed4805d8715e54935 Mon Sep 17 00:00:00 2001
From: William Pitcock <nenolod@dereferenced.org>
Date: Sat, 25 May 2019 04:39:32 +0000
Subject: remove @websub and @ostatus module-level constants

---
 config/config.exs | 2 --
 config/test.exs   | 2 --
 2 files changed, 4 deletions(-)

(limited to 'config')

diff --git a/config/config.exs b/config/config.exs
index 01827fb5f..68168b279 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -184,8 +184,6 @@ config :mime, :types, %{
   "application/ld+json" => ["activity+json"]
 }
 
-config :pleroma, :websub, Pleroma.Web.Websub
-config :pleroma, :ostatus, Pleroma.Web.OStatus
 config :tesla, adapter: Tesla.Adapter.Hackney
 
 # Configures http settings, upstream proxy etc.
diff --git a/config/test.exs b/config/test.exs
index 3bc407840..41cddb9bd 100644
--- a/config/test.exs
+++ b/config/test.exs
@@ -39,8 +39,6 @@ config :pleroma, Pleroma.Repo,
 # Reduce hash rounds for testing
 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
 
-- 
cgit v1.2.3


From 4e45f7bc878638b37225aadcdee547a11d280963 Mon Sep 17 00:00:00 2001
From: lain <lain@soykaf.club>
Date: Fri, 31 May 2019 10:55:35 +0200
Subject: CI: Add auto-deployment via dokku.

---
 config/dokku.exs | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)
 create mode 100644 config/dokku.exs

(limited to 'config')

diff --git a/config/dokku.exs b/config/dokku.exs
new file mode 100644
index 000000000..9ea0ec450
--- /dev/null
+++ b/config/dokku.exs
@@ -0,0 +1,25 @@
+use Mix.Config
+
+config :pleroma, Pleroma.Web.Endpoint,
+  http: [
+    port: String.to_integer(System.get_env("PORT") || "4000"),
+    protocol_options: [max_request_line_length: 8192, max_header_value_length: 8192]
+  ],
+  protocol: "http",
+  secure_cookie_flag: false,
+  url: [host: System.get_env("APP_HOST"), scheme: "https", port: 443],
+  secret_key_base: "+S+ULgf7+N37c/lc9K66SMphnjQIRGklTu0BRr2vLm2ZzvK0Z6OH/PE77wlUNtvP"
+
+database_url =
+  System.get_env("DATABASE_URL") ||
+    raise """
+    environment variable DATABASE_URL is missing.
+    For example: ecto://USER:PASS@HOST/DATABASE
+    """
+
+config :pleroma, Pleroma.Repo,
+  # ssl: true,
+  url: database_url,
+  pool_size: String.to_integer(System.get_env("POOL_SIZE") || "10")
+
+config :pleroma, :instance, name: "#{System.get_env("APP_NAME")} CI Instance"
-- 
cgit v1.2.3