Merge branch 'develop' into feature/activitypub

3 files changed, 49 insertions, 4 deletions

diff --git a/config/config.exs b/config/config.exs
index f26f9ecdf..e6c695215 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -33,7 +33,7 @@ config :mime, :types, %{
 
 config :pleroma, :websub, Pleroma.Web.Websub
 config :pleroma, :ostatus, Pleroma.Web.OStatus
-config :pleroma, :httpoison, HTTPoison
+config :pleroma, :httpoison, Pleroma.HTTP
 
 version = with {version, 0} <- System.cmd("git", ["rev-parse", "HEAD"]) do
             "Pleroma #{String.trim(version)}"
@@ -41,6 +41,10 @@ version = with {version, 0} <- System.cmd("git", ["rev-parse", "HEAD"]) do
             _ -> "Pleroma dev"
           end
 
+# Configures http settings, upstream proxy etc.
+config :pleroma, :http,
+  proxy_url: nil
+
 config :pleroma, :instance,
   version: version,
   name: "Pleroma",
@@ -48,6 +52,14 @@ config :pleroma, :instance,
   limit: 5000,
   registrations_open: true
 
+config :pleroma, :media_proxy,
+  enabled: false,
+  redirect_on_failure: true
+  #base_url: "https://cache.pleroma.social"
+
+config :pleroma, :chat,
+  enabled: true
+
 # 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"
diff --git a/config/emoji.txt b/config/emoji.txt
index 0e668e609..7afacb09f 100644
--- a/config/emoji.txt
+++ b/config/emoji.txt
@@ -1 +1,31 @@
 firefox, /emoji/Firefox.gif
+blank, /emoji/blank.png
+f_00b, /emoji/f_00b.png
+f_00b11b, /emoji/f_00b11b.png
+f_00b33b, /emoji/f_00b33b.png
+f_00h, /emoji/f_00h.png
+f_00t, /emoji/f_00t.png
+f_01b, /emoji/f_01b.png
+f_03b, /emoji/f_03b.png
+f_10b, /emoji/f_10b.png
+f_11b, /emoji/f_11b.png
+f_11b00b, /emoji/f_11b00b.png
+f_11b22b, /emoji/f_11b22b.png
+f_11h, /emoji/f_11h.png
+f_11t, /emoji/f_11t.png
+f_12b, /emoji/f_12b.png
+f_21b, /emoji/f_21b.png
+f_22b, /emoji/f_22b.png
+f_22b11b, /emoji/f_22b11b.png
+f_22b33b, /emoji/f_22b33b.png
+f_22h, /emoji/f_22h.png
+f_22t, /emoji/f_22t.png
+f_23b, /emoji/f_23b.png
+f_30b, /emoji/f_30b.png
+f_32b, /emoji/f_32b.png
+f_33b, /emoji/f_33b.png
+f_33b00b, /emoji/f_33b00b.png
+f_33b22b, /emoji/f_33b22b.png
+f_33h, /emoji/f_33h.png
+f_33t, /emoji/f_33t.png
+
diff --git a/config/prod.exs b/config/prod.exs
index 732bab2b0..8522c67da 100644
--- a/config/prod.exs
+++ b/config/prod.exs
@@ -14,9 +14,12 @@ use Mix.Config
 # manifest is generated by the mix phoenix.digest task
 # which you typically run after static files are built.
 config :pleroma, Pleroma.Web.Endpoint,
-  on_init: {Pleroma.Web.Endpoint, :load_from_system_env, []},
-  url: [host: "example.com", port: 80],
-  cache_static_manifest: "priv/static/cache_manifest.json"
+  http: [port: 4000],
+  protocol: "http",
+  debug_errors: true,
+  code_reloader: true,
+  check_origin: false,
+  watchers: []
 
 # Do not print debug messages in production
 config :logger, level: :info