logo

pleroma

My custom branche(s) on git.pleroma.social/pleroma/pleroma
commit: 9b1e75bac8f6e042e7f70e4f29cc60fa96000323
parent: a8c9522e04c5d687f8985698de864cccdf3d65e1
Author: rinpatch <rinpatch@sdf.org>
Date:   Sat, 29 Jun 2019 11:24:14 +0000

Merge branch 'my-develop' into 'develop'

Docker specific configuration information

See merge request pleroma/pleroma!1359

Diffstat:

Mdocs/config.md2+-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/config.md b/docs/config.md @@ -280,7 +280,7 @@ config :pleroma, :mrf_subchain, ## Pleroma.Web.Endpoint `Phoenix` endpoint configuration, all configuration options can be viewed [here](https://hexdocs.pm/phoenix/Phoenix.Endpoint.html#module-dynamic-configuration), only common options are listed here -* `http` - a list containing http protocol configuration, all configuration options can be viewed [here](https://hexdocs.pm/plug_cowboy/Plug.Cowboy.html#module-options), only common options are listed here +* `http` - a list containing http protocol configuration, all configuration options can be viewed [here](https://hexdocs.pm/plug_cowboy/Plug.Cowboy.html#module-options), only common options are listed here. For deployment using docker, you need to set this to `[ip: {0,0,0,0}, port: 4000]` to make pleroma accessible from other containers (such as your nginx server). - `ip` - a tuple consisting of 4 integers - `port` * `url` - a list containing the configuration for generating urls, accepts