mirror of
https://github.com/element-hq/dendrite.git
synced 2025-09-13 12:52:24 +03:00
Merge commit from fork
* Support configuring allow/deny networks * Make the DNS cache aware of the allow/deny networks * Allow all networks in CI * Update GMSL * Add missed file --------- Co-authored-by: Till Faelligen <2353100+S7evinK@users.noreply.github.com>
This commit is contained in:
parent
4fb83354ca
commit
e9cc37ac52
9 changed files with 50 additions and 3 deletions
|
@ -70,6 +70,8 @@ func main() {
|
|||
dnsCache = fclient.NewDNSCache(
|
||||
cfg.Global.DNSCache.CacheSize,
|
||||
cfg.Global.DNSCache.CacheLifetime,
|
||||
cfg.FederationAPI.AllowNetworkCIDRs,
|
||||
cfg.FederationAPI.DenyNetworkCIDRs,
|
||||
)
|
||||
logrus.Infof(
|
||||
"DNS cache enabled (size %d, lifetime %s)",
|
||||
|
|
|
@ -65,6 +65,8 @@ func main() {
|
|||
dnsCache = fclient.NewDNSCache(
|
||||
cfg.Global.DNSCache.CacheSize,
|
||||
cfg.Global.DNSCache.CacheLifetime,
|
||||
cfg.FederationAPI.AllowNetworkCIDRs,
|
||||
cfg.FederationAPI.DenyNetworkCIDRs,
|
||||
)
|
||||
logrus.Infof(
|
||||
"DNS cache enabled (size %d, lifetime %s)",
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue