Merge branch 'bugfix/s3-configuration' into 'develop'

[akkoma] / config / config.exs

diff --git a/config/config.exs b/config/config.exs
index 6b1e31398cdba486a2e70b6a37e320d06d3cf0ec..e223635196ce5f503c74ef355461f77f908e14e9 100644 (file)
--- a/config/config.exs
+++ b/config/config.exs
@@ -11,9 +11,15 @@ config :pleroma, ecto_repos: [Pleroma.Repo]
 config :pleroma, Pleroma.Repo, types: Pleroma.PostgresTypes
 
 config :pleroma, Pleroma.Upload,
-  uploads: "uploads",
+  uploader: Pleroma.Uploaders.Local,
   strip_exif: false
 
+config :pleroma, Pleroma.Uploaders.Local, uploads: "uploads"
+
+config :pleroma, Pleroma.Uploaders.S3,
+  bucket: nil,
+  public_endpoint: "https://s3.amazonaws.com"
+
 config :pleroma, :emoji, shortcode_globs: ["/emoji/custom/**/*.png"]
 
 config :pleroma, :uri_schemes, additionnal_schemes: []
@@ -61,6 +67,7 @@ config :pleroma, :instance,
   upload_limit: 16_000_000,
   registrations_open: true,
   federating: true,
+  allow_relay: true,
   rewrite_policy: Pleroma.Web.ActivityPub.MRF.NoOpPolicy,
   public: true,
   quarantined_instances: []
@@ -68,6 +75,8 @@ config :pleroma, :instance,
 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",