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 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