diff options
| author | lambda <pleromagit@rogerbraun.net> | 2018-03-08 12:29:02 +0000 |
|---|---|---|
| committer | lambda <pleromagit@rogerbraun.net> | 2018-03-08 12:29:02 +0000 |
| commit | 460062f2b04220ffcd8f20aa842cc95582d1f849 (patch) | |
| tree | f56c298bed6b289aa2dd81766862265ccef05947 /config | |
| parent | 0f2bf3eefb0adba13a3f3d37e8d8b1bd414a33e4 (diff) | |
| parent | 611ca385dea3d611a97579000311cc42684305e6 (diff) | |
| download | pleroma-460062f2b04220ffcd8f20aa842cc95582d1f849.tar.gz pleroma-460062f2b04220ffcd8f20aa842cc95582d1f849.zip | |
Merge branch 'feature/activitypub' into 'develop'
Feature/activitypub
See merge request pleroma/pleroma!67
Diffstat (limited to 'config')
| -rw-r--r-- | config/config.exs | 3 | ||||
| -rw-r--r-- | config/dev.exs | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/config/config.exs b/config/config.exs index 703c10c48..bd714a189 100644 --- a/config/config.exs +++ b/config/config.exs @@ -27,7 +27,8 @@ config :logger, :console, metadata: [:request_id] config :mime, :types, %{ - "application/xrd+xml" => ["xrd+xml"] + "application/xrd+xml" => ["xrd+xml"], + "application/activity+json" => ["activity+json"] } config :pleroma, :websub, Pleroma.Web.Websub diff --git a/config/dev.exs b/config/dev.exs index 83326e6f2..a697d3a24 100644 --- a/config/dev.exs +++ b/config/dev.exs @@ -7,7 +7,7 @@ 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], + http: [port: 4000, protocol_options: [max_request_line_length: 8192, max_header_value_length: 8192]], protocol: "http", debug_errors: true, code_reloader: true, |