diff options
| author | kaniini <nenolod@gmail.com> | 2019-07-10 05:14:08 +0000 |
|---|---|---|
| committer | kaniini <nenolod@gmail.com> | 2019-07-10 05:14:08 +0000 |
| commit | 75be90a6d177b00c4ca1083331975805c6f9afde (patch) | |
| tree | 0d799d03b2f273d7ed7360c64335f57f41bb554a /priv | |
| parent | 8f2cb820c0cc41791cea7884cf4dd1726d227cc0 (diff) | |
| parent | 6d0ae264fc90508a6df39f77a11d1d8069bfa466 (diff) | |
| download | pleroma-75be90a6d177b00c4ca1083331975805c6f9afde.tar.gz pleroma-75be90a6d177b00c4ca1083331975805c6f9afde.zip | |
Merge branch 'release/listener' into 'develop'
add listener port and ip option for 'pleroma.instance gen' and enable its test
See merge request pleroma/pleroma!1393
Diffstat (limited to 'priv')
| -rw-r--r-- | priv/templates/sample_config.eex | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/priv/templates/sample_config.eex b/priv/templates/sample_config.eex index 5cc31c604..ca9c7a2c2 100644 --- a/priv/templates/sample_config.eex +++ b/priv/templates/sample_config.eex @@ -11,6 +11,7 @@ end %> config :pleroma, Pleroma.Web.Endpoint, url: [host: "<%= domain %>", scheme: "https", port: <%= port %>], + http: [ip: {<%= String.replace(listen_ip, ".", ", ") %>}, port: <%= listen_port %>], secret_key_base: "<%= secret %>", signing_salt: "<%= signing_salt %>" |