X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;ds=sidebyside;f=config%2Fconfig.exs;h=68c0544579803bc96249bd71f325bb944a73f0f0;hb=f0798440de96139f5717e90582e41ddb6ce5a0ce;hp=bf050197fed293e627922ae4c2497b356ed54d14;hpb=08fdbd6f3ab15ac8312073d832324516b723b81a;p=akkoma

diff --git a/config/config.exs b/config/config.exs
index bf050197f..68c054457 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -6,25 +6,71 @@
 use Mix.Config
 
 # General application configuration
-config :pleroma,
-  ecto_repos: [Pleroma.Repo]
+config :pleroma, ecto_repos: [Pleroma.Repo]
 
-config :pleroma, Pleroma.Upload,
-  uploads: "uploads"
+config :pleroma, Pleroma.Repo, types: Pleroma.PostgresTypes
+
+config :pleroma, Pleroma.Upload, uploads: "uploads"
 
 # Configures the endpoint
 config :pleroma, Pleroma.Web.Endpoint,
   url: [host: "localhost"],
+  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]
 
 # Configures Elixir's Logger
 config :logger, :console,
   format: "$time $metadata[$level] $message\n",
   metadata: [:request_id]
 
+config :mime, :types, %{
+  "application/xrd+xml" => ["xrd+xml"],
+  "application/activity+json" => ["activity+json"],
+  "application/ld+json" => ["activity+json"]
+}
+
+config :pleroma, :websub, Pleroma.Web.Websub
+config :pleroma, :ostatus, Pleroma.Web.OStatus
+config :pleroma, :httpoison, Pleroma.HTTP
+
+version =
+  with {version, 0} <- System.cmd("git", ["rev-parse", "HEAD"]) do
+    "Pleroma #{Mix.Project.config()[:version]} #{String.trim(version)}"
+  else
+    _ -> "Pleroma #{Mix.Project.config()[:version]} dev"
+  end
+
+# Configures http settings, upstream proxy etc.
+config :pleroma, :http, proxy_url: nil
+
+config :pleroma, :instance,
+  version: version,
+  name: "Pleroma",
+  email: "example@example.com",
+  limit: 5000,
+  upload_limit: 16_000_000,
+  registrations_open: true,
+  federating: true
+
+config :pleroma, :media_proxy,
+  enabled: false,
+  redirect_on_failure: true
+
+# base_url: "https://cache.pleroma.social"
+
+config :pleroma, :chat, enabled: true
+
+config :ecto, json_library: Jason
+
+config :phoenix, :format_encoders, json: Jason
+
+config :pleroma, :gopher,
+  enabled: false,
+  ip: {0, 0, 0, 0},
+  port: 9999
+
 # 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"
+import_config "#{Mix.env()}.exs"