X-Git-Url: https://git.squeep.com/?a=blobdiff_plain;f=config%2Fconfig.exs;h=ed718c3d3cd6f583a8a7d1a55f53a474abf2f5c5;hb=b564c23d925ca43c00364541b042f856063d479e;hp=4eb59994cc6c43b8875a1156557482a77bc44162;hpb=709816a0f891d6c26c43b54577a3b727c1fe4af6;p=akkoma

diff --git a/config/config.exs b/config/config.exs
index 4eb59994c..ed718c3d3 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -11,14 +11,16 @@ config :pleroma, ecto_repos: [Pleroma.Repo]
 config :pleroma, Pleroma.Repo, types: Pleroma.PostgresTypes
 
 config :pleroma, Pleroma.Upload,
-  uploader: Pleroma.Uploaders.Local
+  uploader: Pleroma.Uploaders.Local,
   strip_exif: false
 
 config :pleroma, Pleroma.Uploaders.Local,
-  uploads: "uploads"
+  uploads: "uploads",
+  uploads_url: "{{base_url}}/media/{{file}}"
 
 config :pleroma, Pleroma.Uploaders.S3,
-  s3_bucket: nil
+  bucket: nil,
+  public_endpoint: "https://s3.amazonaws.com"
 
 config :pleroma, :emoji, shortcode_globs: ["/emoji/custom/**/*.png"]
 
@@ -30,7 +32,8 @@ config :pleroma, Pleroma.Web.Endpoint,
   protocol: "https",
   secret_key_base: "aK4Abxf29xU9TTDKre9coZPUgevcVCFQJe/5xP/7Lt4BEif6idBIbjupVbOrbKxl",
   render_errors: [view: Pleroma.Web.ErrorView, accepts: ~w(json)],
-  pubsub: [name: Pleroma.PubSub, adapter: Phoenix.PubSub.PG2]
+  pubsub: [name: Pleroma.PubSub, adapter: Phoenix.PubSub.PG2],
+  secure_cookie_flag: true
 
 # Configures Elixir's Logger
 config :logger, :console,
@@ -70,11 +73,14 @@ config :pleroma, :instance,
   allow_relay: true,
   rewrite_policy: Pleroma.Web.ActivityPub.MRF.NoOpPolicy,
   public: true,
-  quarantined_instances: []
+  quarantined_instances: [],
+  managed_config: true
 
 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",
@@ -122,6 +128,7 @@ config :pleroma, :suggestions,
   third_party_engine:
     "http://vinayaka.distsn.org/cgi-bin/vinayaka-user-match-suggestions-api.cgi?{{host}}+{{user}}",
   timeout: 300_000,
+  limit: 23,
   web: "https://vinayaka.distsn.org/?{{host}}+{{user}}"
 
 # Import environment specific config. This must remain at the bottom