]> cat aescling's git repositories - mastodon.git/commit
Merge `HIDDEN_SERVICE_VIA_TRANSPARENT_PROXY` into `ALLOW_ACCESS_TO_HIDDEN_SERVICE...
authorMIYAGI Hikaru <hcmiya@users.noreply.github.com>
Fri, 29 Jun 2018 13:36:02 +0000 (22:36 +0900)
committerEugen Rochko <eugen@zeonfederated.com>
Fri, 29 Jun 2018 13:36:02 +0000 (15:36 +0200)
commitddd0bb69e1d9ea98a0ea30717e9f25bcd50b41a3
tree6f4369d30ccd172d7c4de997cc3aba621c781f1f
parentcdb101340a20183a82889f811d9311c370c855e5
Merge `HIDDEN_SERVICE_VIA_TRANSPARENT_PROXY` into `ALLOW_ACCESS_TO_HIDDEN_SERVICE` (#7901)

If Mastodon accesses to the hidden service via transparent proxy, it's needed to avoid checking whether it's a private address, since `.onion` is resolved to a private address.
I was previously using the `HIDDEN_SERVICE_VIA_TRANSPARENT_PROXY` to provide that function. However, I realized that using `HIDDEN_SERVICE_VIA_TRANSPARENT_PROXY` is redundant, since this specification is always used with `ALLOW_ACCESS_TO_HIDDEN_SERVICE`. Therefore, I decided to integrate the setting of `HIDDEN_SERVICE_VIA_TRANSPARENT_PROXY` into` ALLOW_ACCESS_TO_HIDDEN_SERVICE`.
.env.production.sample
app/lib/request.rb
config/initializers/http_client_proxy.rb
docker-compose.yml