diff options
| author | rinpatch <rinpatch@sdf.org> | 2019-06-29 11:24:14 +0000 |
|---|---|---|
| committer | rinpatch <rinpatch@sdf.org> | 2019-06-29 11:24:14 +0000 |
| commit | 9b1e75bac8f6e042e7f70e4f29cc60fa96000323 (patch) | |
| tree | 036e495b3cbf663d967a063dde8394d952634443 | |
| parent | a8c9522e04c5d687f8985698de864cccdf3d65e1 (diff) | |
| parent | 4c40ada7a5f5067f26135de5fcd97b2d97f90441 (diff) | |
| download | pleroma-9b1e75bac8f6e042e7f70e4f29cc60fa96000323.tar.gz pleroma-9b1e75bac8f6e042e7f70e4f29cc60fa96000323.zip | |
Merge branch 'my-develop' into 'develop'
Docker specific configuration information
See merge request pleroma/pleroma!1359
| -rw-r--r-- | docs/config.md | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/config.md b/docs/config.md index 7d5be3980..feef43ba9 100644 --- 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 |