4 files changed, 56 insertions, 29 deletions
diff --git a/config/config.exs b/config/config.exs
index bd714a189..d3f9cf6e4 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -6,11 +6,11 @@
 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,
@@ -18,8 +18,7 @@ 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]
 
 # Configures Elixir's Logger
 config :logger, :console,
@@ -28,39 +27,58 @@ config :logger, :console,
 
 config :mime, :types, %{
   "application/xrd+xml" => ["xrd+xml"],
-  "application/activity+json" => ["activity+json"]
+  "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 #{String.trim(version)}"
-          else
-            _ -> "Pleroma dev"
-          end
+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, :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
+  federating: true,
+  rewrite_policy: Pleroma.Web.ActivityPub.MRF.NoOpPolicy,
+  public: true
+
+config :pleroma, :mrf_simple,
+  media_removal: [],
+  media_nsfw: [],
+  federated_timeline_removal: [],
+  reject: []
 
 config :pleroma, :media_proxy,
   enabled: false,
   redirect_on_failure: true
-  #base_url: "https://cache.pleroma.social"
 
-config :pleroma, :chat,
-  enabled: 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"
diff --git a/config/dev.exs b/config/dev.exs
index a697d3a24..7b06ad67e 100644
--- a/config/dev.exs
+++ b/config/dev.exs
@@ -7,7 +7,10 @@ use Mix.Config
 # watchers to your application. For example, we use it
 # with brunch.io to recompile .js and .css sources.
 config :pleroma, Pleroma.Web.Endpoint,
-  http: [port: 4000, protocol_options: [max_request_line_length: 8192, max_header_value_length: 8192]],
+  http: [
+    port: 4000,
+    protocol_options: [max_request_line_length: 8192, max_header_value_length: 8192]
+  ],
   protocol: "http",
   debug_errors: true,
   code_reloader: true,
@@ -49,5 +52,8 @@ config :pleroma, Pleroma.Repo,
 try do
   import_config "dev.secret.exs"
 rescue
-  _-> IO.puts("!!! RUNNING IN LOCALHOST DEV MODE! !!!\nFEDERATION WON'T WORK UNTIL YOU CONFIGURE A dev.secret.exs")
+  _ ->
+    IO.puts(
+      "!!! RUNNING IN LOCALHOST DEV MODE! !!!\nFEDERATION WON'T WORK UNTIL YOU CONFIGURE A dev.secret.exs"
+    )
 end
diff --git a/config/prod.exs b/config/prod.exs
index 8522c67da..d0cfd1ac2 100644
--- a/config/prod.exs
+++ b/config/prod.exs
@@ -15,11 +15,7 @@ use Mix.Config
 # which you typically run after static files are built.
 config :pleroma, Pleroma.Web.Endpoint,
   http: [port: 4000],
-  protocol: "http",
-  debug_errors: true,
-  code_reloader: true,
-  check_origin: false,
-  watchers: []
+  protocol: "http"
 
 # Do not print debug messages in production
 config :logger, level: :info
diff --git a/config/test.exs b/config/test.exs
index 26b5410fe..0c73f892a 100644
--- a/config/test.exs
+++ b/config/test.exs
@@ -9,8 +9,7 @@ config :pleroma, Pleroma.Web.Endpoint,
 # Print only warnings and errors during test
 config :logger, level: :warn
 
-config :pleroma, Pleroma.Upload,
-  uploads: "test/uploads"
+config :pleroma, Pleroma.Upload, uploads: "test/uploads"
 
 # Configure your database
 config :pleroma, Pleroma.Repo,
@@ -21,10 +20,18 @@ config :pleroma, Pleroma.Repo,
   hostname: System.get_env("DB_HOST") || "localhost",
   pool: Ecto.Adapters.SQL.Sandbox
 
-
 # Reduce hash rounds for testing
 config :comeonin, :pbkdf2_rounds, 1
 
 config :pleroma, :websub, Pleroma.Web.WebsubMock
 config :pleroma, :ostatus, Pleroma.Web.OStatusMock
 config :pleroma, :httpoison, HTTPoisonMock
+
+try do
+  import_config "test.secret.exs"
+rescue
+  _ ->
+    IO.puts(
+      "You may want to create test.secret.exs to declare custom database connection parameters."
+    )
+end