aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorkaniini <nenolod@gmail.com>2019-06-23 06:53:38 +0000
committerkaniini <nenolod@gmail.com>2019-06-23 06:53:38 +0000
commit48174dc290d571ad72c17758c2f6275871e609a4 (patch)
treecf6d9a4b5e465060f75a55e4cb9631070060c7ee
parent27b9605de05a8d7097852213e8b53b5b4633a8eb (diff)
parent875100de018d4e0980656a0fc75eb51f97fa0eee (diff)
downloadpleroma-48174dc290d571ad72c17758c2f6275871e609a4.tar.gz
Merge branch 'bind-to-localhost' into 'develop'
Bind to 127.0.0.1 instead of 0.0.0.0 by default See merge request pleroma/pleroma!1329
-rw-r--r--CHANGELOG.md1
-rw-r--r--config/config.exs1
2 files changed, 2 insertions, 0 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0dc8b547d..d3c554245 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -65,6 +65,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
- MRF: Support for filtering out likely spam messages by rejecting posts from new users that contain links.
### Changed
+- **Breaking:** bind to 127.0.0.1 instead of 0.0.0.0 by default
- **Breaking:** Configuration: move from Pleroma.Mailer to Pleroma.Emails.Mailer
- Thread containment / test for complete visibility will be skipped by default.
- Enforcement of OAuth scopes
diff --git a/config/config.exs b/config/config.exs
index 3962ac019..0d07fc692 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -139,6 +139,7 @@ config :pleroma, Pleroma.Web.Endpoint,
instrumenters: [Pleroma.Web.Endpoint.Instrumenter],
url: [host: "localhost"],
http: [
+ ip: {127, 0, 0, 1},
dispatch: [
{:_,
[